[18/22] Convert CONFIG_SYS_USE_NORFLASH et al to Kconfig

Message ID	20220323212009.1066483-18-trini@konsulko.com
State	Accepted
Commit	d7b7e3e906523cb1e543eca290a88fb58f03b8cd
Delegated to:	Tom Rini
Headers	show Return-Path: <u-boot-bounces@lists.denx.de> From: Tom Rini <trini@konsulko.com> To: u-boot@lists.denx.de Subject: [PATCH 18/22] Convert CONFIG_SYS_USE_NORFLASH et al to Kconfig Date: Wed, 23 Mar 2022 17:20:05 -0400 Message-Id: <20220323212009.1066483-18-trini@konsulko.com> In-Reply-To: <20220323212009.1066483-1-trini@konsulko.com> References: <20220323212009.1066483-1-trini@konsulko.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: list Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" <u-boot-bounces@lists.denx.de>
Series	[01/22] Convert CONFIG_CF_DSPI to Kconfig \| expand [01/22] Convert CONFIG_CF_DSPI to Kconfig [02/22] Convert CONFIG_MCFTMR to Kconfig [03/22] stmark2: Remove CONFIG_SERIAL_FLASH [04/22] Convert CONFIG_MCFRTC et al to Kconfig [05/22] stmark2: Migrate CONFIG_SYS_EXTRA_OPTIONS to Kconfig [06/22] mx28evk_auart_console: Remove CONFIG_SYS_EXTRA_OPTIONS [07/22] Convert CONFIG_EMMC_BOOT et al to Kconfig [08/22] keymile: Move sourcing of common Kconfig [09/22] kmtegr1: Drop CONFIG_KMTEGR1 [10/22] Convert CONFIG_KM_COGE5UN et al to Kconfig [11/22] mpc8548cds: Rework CONFIG_LEGACY usage [12/22] Convert CONFIG_LSCHLV2 to Kconfig et al [13/22] Convert CONFIG_LPUART et al to Kconfig [14/22] MPC837XERDB: Move CONFIG_PCIE to Kconfig [15/22] am43xx_evm_qspiboot: Remove CONFIG_SYS_EXTRA_OPTIONS [16/22] Convert CONFIG_SDCARD et al to Kconfig [17/22] global: Remove CONFIG_SYS_USE_DATAFLASH* [18/22] Convert CONFIG_SYS_USE_NORFLASH et al to Kconfig [19/22] exynos: Drop CONFIG_CLK_* [20/22] Convert CONFIG_CLOCK_SYNTHESIZER to Kconfig [21/22] Convert CONFIG_CLOCKS to Kconfig [22/22] p1_p2_rdb: Remove CONFIG_CPLD_[BO]R_PRELIM

Message ID

20220323212009.1066483-18-trini@konsulko.com

State

Accepted

Commit

d7b7e3e906523cb1e543eca290a88fb58f03b8cd

Delegated to:

Tom Rini

Headers

show

Return-Path: <u-boot-bounces@lists.denx.de>
X-Original-To: incoming@patchwork.ozlabs.org
Delivered-To: patchwork-incoming@bilbo.ozlabs.org
Authentication-Results: ozlabs.org;
 spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de
 (client-ip=2a01:238:438b:c500:173d:9f52:ddab:ee01; helo=phobos.denx.de;
 envelope-from=u-boot-bounces@lists.denx.de; receiver=<UNKNOWN>)
Received: from phobos.denx.de (phobos.denx.de
 [IPv6:2a01:238:438b:c500:173d:9f52:ddab:ee01])
	(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
	 key-exchange X25519 server-signature RSA-PSS (4096 bits))
	(No client certificate requested)
	by bilbo.ozlabs.org (Postfix) with ESMTPS id 4KP1YZ51Qgz9s5V
	for <incoming@patchwork.ozlabs.org>; Thu, 24 Mar 2022 08:23:30 +1100 (AEDT)
Received: from h2850616.stratoserver.net (localhost [IPv6:::1])
	by phobos.denx.de (Postfix) with ESMTP id C8B8584022;
	Wed, 23 Mar 2022 22:21:44 +0100 (CET)
Authentication-Results: phobos.denx.de;
 dmarc=fail (p=none dis=none) header.from=konsulko.com
Authentication-Results: phobos.denx.de;
 spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de
Received: by phobos.denx.de (Postfix, from userid 109)
 id 5656483FD7; Wed, 23 Mar 2022 22:20:43 +0100 (CET)
X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de
X-Spam-Level: 
X-Spam-Status: No, score=-1.4 required=5.0 tests=BAYES_00,
 FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM,HEADER_FROM_DIFFERENT_DOMAINS,
 RCVD_IN_MSPIKE_H3,RCVD_IN_MSPIKE_WL,SPF_HELO_NONE,SPF_PASS,
 T_SCC_BODY_TEXT_LINE autolearn=no autolearn_force=no version=3.4.2
Received: from mail-qt1-f178.google.com (mail-qt1-f178.google.com
 [209.85.160.178])
 (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits))
 (No client certificate requested)
 by phobos.denx.de (Postfix) with ESMTPS id 3962883FDB
 for <u-boot@lists.denx.de>; Wed, 23 Mar 2022 22:20:31 +0100 (CET)
Authentication-Results: phobos.denx.de;
 dmarc=fail (p=none dis=none) header.from=konsulko.com
Authentication-Results: phobos.denx.de;
 spf=pass smtp.mailfrom=tom.rini@gmail.com
Received: by mail-qt1-f178.google.com with SMTP id bp39so2342636qtb.6
 for <u-boot@lists.denx.de>; Wed, 23 Mar 2022 14:20:31 -0700 (PDT)
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
 d=1e100.net; s=20210112;
 h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to
 :references:mime-version:content-transfer-encoding;
 bh=F63QwUfVN3N5bj2ZzUBzNaInLEeAqa8BqybjZIt7Ql8=;
 b=yKG9vwmhIosSRywDcZ/7HkznrktFL2+Q0sNczqT0lY6ZTe6zLiU9Aw3wzWdqNTc8G6
 7dGYRm+cI0hI5125ltmfr58iUWSvk7uM52y6mtOXIdyEpvH6Sw4gE+T1N5dauNhGK0zn
 IDkpfDprvi6abY4hlaHthz3nlqyWKmKn8PToSIQs4FjdjRu/QmCXuPBvU+xLJIVA6Fdr
 MjnYW78YkaeD9qjJRLeMaMHOWEqKWgG1AeF9/N5R39uG6Xx8Gg+VZ8DANssy0Fp861Xn
 CBRR7vTrONEuk+AtDJNNwdtQURnpFoGjvATCou1wU8dpa3MRvMQUk/CZ6CbUU5pX2yoO
 HiXw==
X-Gm-Message-State: AOAM533uORNJjXilH9IXSgCat1FQkT/RZuz3u9jni9OAguGCo/8bqVvz
 MJ+h8GBbIU5AvF2TkyyTfY8dloDZ3w==
X-Google-Smtp-Source: 
 ABdhPJx4FxPl5+V8W5BYl6KsU3VSsFGMRvNlJZEiF33qeCpbHNagyRo8hNuxpxND2FoI1N/HU2FG+w==
X-Received: by 2002:ac8:7d56:0:b0:2e0:6591:2bbb with SMTP id
 h22-20020ac87d56000000b002e065912bbbmr1624196qtb.505.1648070429811;
 Wed, 23 Mar 2022 14:20:29 -0700 (PDT)
Received: from bill-the-cat.lan
 (2603-6081-7b01-cbda-2ef0-5dff-fedb-a8ba.res6.spectrum.com.
 [2603:6081:7b01:cbda:2ef0:5dff:fedb:a8ba])
 by smtp.gmail.com with ESMTPSA id
 w8-20020ac87e88000000b002e1cdc11203sm868269qtj.18.2022.03.23.14.20.29
 for <u-boot@lists.denx.de>
 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);
 Wed, 23 Mar 2022 14:20:29 -0700 (PDT)
From: Tom Rini <trini@konsulko.com>
To: u-boot@lists.denx.de
Subject: [PATCH 18/22] Convert CONFIG_SYS_USE_NORFLASH et al to Kconfig
Date: Wed, 23 Mar 2022 17:20:05 -0400
Message-Id: <20220323212009.1066483-18-trini@konsulko.com>
X-Mailer: git-send-email 2.25.1
In-Reply-To: <20220323212009.1066483-1-trini@konsulko.com>
References: <20220323212009.1066483-1-trini@konsulko.com>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
X-BeenThere: u-boot@lists.denx.de
X-Mailman-Version: 2.1.39
Precedence: list
List-Id: U-Boot discussion <u-boot.lists.denx.de>
List-Unsubscribe: <https://lists.denx.de/options/u-boot>,
 <mailto:u-boot-request@lists.denx.de?subject=unsubscribe>
List-Archive: <https://lists.denx.de/pipermail/u-boot/>
List-Post: <mailto:u-boot@lists.denx.de>
List-Help: <mailto:u-boot-request@lists.denx.de?subject=help>
List-Subscribe: <https://lists.denx.de/listinfo/u-boot>,
 <mailto:u-boot-request@lists.denx.de?subject=subscribe>
Errors-To: u-boot-bounces@lists.denx.de
Sender: "U-Boot" <u-boot-bounces@lists.denx.de>
X-Virus-Scanned: clamav-milter 0.103.5 at phobos.denx.de
X-Virus-Status: Clean

Series

[01/22] Convert CONFIG_CF_DSPI to Kconfig | expand

Commit Message

Tom Rini March 23, 2022, 9:20 p.m. UTC

This converts the following to Kconfig:
   CONFIG_SYS_USE_NORFLASH
   CONFIG_SYS_USE_BOOT_NORFLASH

Signed-off-by: Tom Rini <trini@konsulko.com>
---
 board/atmel/at91sam9263ek/Kconfig             | 3 +++
 configs/at91sam9263ek_norflash_boot_defconfig | 2 +-
 configs/at91sam9263ek_norflash_defconfig      | 2 +-
 include/configs/at91sam9263ek.h               | 5 -----
 4 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/board/atmel/at91sam9263ek/Kconfig b/board/atmel/at91sam9263ek/Kconfig
index 3f0873fe5105..71cbc89123e7 100644
--- a/board/atmel/at91sam9263ek/Kconfig
+++ b/board/atmel/at91sam9263ek/Kconfig
@@ -9,4 +9,7 @@  config SYS_VENDOR
 config SYS_CONFIG_NAME
 	default "at91sam9263ek"
 
+config SYS_USE_NORFLASH
+	bool "Use the NOR flash on the platform"
+
 endif
diff --git a/configs/at91sam9263ek_norflash_boot_defconfig b/configs/at91sam9263ek_norflash_boot_defconfig
index 0e96b3a9c13c..bcd52f666a35 100644
--- a/configs/at91sam9263ek_norflash_boot_defconfig
+++ b/configs/at91sam9263ek_norflash_boot_defconfig
@@ -6,6 +6,7 @@  CONFIG_SYS_MALLOC_LEN=0x50000
 CONFIG_SYS_MALLOC_F_LEN=0x2000
 CONFIG_TARGET_AT91SAM9263EK=y
 CONFIG_ATMEL_LEGACY=y
+CONFIG_SYS_USE_NORFLASH=y
 CONFIG_NR_DRAM_BANKS=1
 CONFIG_ENV_SIZE=0x10000
 CONFIG_ENV_SECT_SIZE=0x10000
@@ -16,7 +17,6 @@  CONFIG_DEBUG_UART_BASE=0xffffee00
 CONFIG_DEBUG_UART_CLOCK=100000000
 CONFIG_DEBUG_UART=y
 CONFIG_SYS_LOAD_ADDR=0x22000000
-CONFIG_SYS_EXTRA_OPTIONS="SYS_USE_BOOT_NORFLASH"
 CONFIG_BOOTDELAY=3
 CONFIG_SYS_CONSOLE_IS_IN_ENV=y
 # CONFIG_DISPLAY_BOARDINFO is not set
diff --git a/configs/at91sam9263ek_norflash_defconfig b/configs/at91sam9263ek_norflash_defconfig
index 20a105085cea..68c3dcca18a7 100644
--- a/configs/at91sam9263ek_norflash_defconfig
+++ b/configs/at91sam9263ek_norflash_defconfig
@@ -7,6 +7,7 @@  CONFIG_SYS_MALLOC_LEN=0x50000
 CONFIG_SYS_MALLOC_F_LEN=0x2000
 CONFIG_TARGET_AT91SAM9263EK=y
 CONFIG_ATMEL_LEGACY=y
+CONFIG_SYS_USE_NORFLASH=y
 CONFIG_NR_DRAM_BANKS=1
 CONFIG_ENV_SIZE=0x10000
 CONFIG_ENV_SECT_SIZE=0x10000
@@ -17,7 +18,6 @@  CONFIG_DEBUG_UART_BASE=0xffffee00
 CONFIG_DEBUG_UART_CLOCK=100000000
 CONFIG_DEBUG_UART=y
 CONFIG_SYS_LOAD_ADDR=0x22000000
-CONFIG_SYS_EXTRA_OPTIONS="SYS_USE_NORFLASH"
 CONFIG_BOOTDELAY=3
 CONFIG_SYS_CONSOLE_IS_IN_ENV=y
 # CONFIG_DISPLAY_BOARDINFO is not set
diff --git a/include/configs/at91sam9263ek.h b/include/configs/at91sam9263ek.h
index 9fdf48be0d16..eb922ba03dc9 100644
--- a/include/configs/at91sam9263ek.h
+++ b/include/configs/at91sam9263ek.h
@@ -22,11 +22,6 @@ 
 #define CONFIG_SYS_AT91_MAIN_CLOCK	16367660 /* 16.367 MHz crystal */
 #define CONFIG_SYS_AT91_SLOW_CLOCK	32768
 
-#ifndef CONFIG_SYS_USE_BOOT_NORFLASH
-#else
-#define CONFIG_SYS_USE_NORFLASH
-#endif
-
 /*
  * Hardware drivers
  */

[18/22] Convert CONFIG_SYS_USE_NORFLASH et al to Kconfig

Commit Message

Patch