configs: Convert CONFIG_USE_NAND to CONFIG_NAND

PATCH In review Adam Ford 2 participants 2 messages Jul 10, 2018 – Jul 23, 2018

Share & tools

Adam Ford

author

2018-07-10 11:47 UTC #0 lore raw

PATCH 1/1 configs: Convert CONFIG_USE_NAND to CONFIG_NAND

The DA850-EVM and OMAPL138_LCDK both use checks for CONFIG_USE_NAND. This patch changes these checks to CONFIG_NAND which is already defined in Kconfig. Since the OMAPL138_LCDK already had CONFIG_NAND defined in its defconfig, it can be deleted from configs/omapl138_lcdk.h.

Signed-off-by Adam Ford <[email protected]>

include/configs/da850evm.h +3 -3

index ebfdd1c7a3..6690be60b6 100644
@@ -148,7 +148,7 @@
 /*
  * Flash & Environment
  */
-#ifdef CONFIG_USE_NAND
+#ifdef CONFIG_NAND
 #define CONFIG_NAND_DAVINCI
 #define CONFIG_ENV_OFFSET		0x0 /* Block 0--not used by bootcode */
 #define CONFIG_ENV_SIZE			(128 << 10)

@@ -273,12 +273,12 @@
 #define CONFIG_CLOCKS
 #endif
 
-#ifdef CONFIG_USE_NAND
+#ifdef CONFIG_NAND
 #define CONFIG_MTD_DEVICE
 #define CONFIG_MTD_PARTITIONS
 #endif
 
-#if !defined(CONFIG_USE_NAND) && \
+#if !defined(CONFIG_NAND) && \
 	!defined(CONFIG_USE_NOR) && \
 	!defined(CONFIG_USE_SPIFLASH)
 #define CONFIG_ENV_SIZE		(16 << 10)

include/configs/omapl138_lcdk.h +3 -4

index 58624ec581..ee6f866581 100644
@@ -16,7 +16,6 @@
 #define CONFIG_DRIVER_TI_EMAC
 #undef CONFIG_USE_SPIFLASH
 #undef	CONFIG_SYS_USE_NOR
-#define	CONFIG_USE_NAND
 
 /*
 * Disable DM_* for SPL build and can be re-enabled after adding

@@ -142,7 +141,7 @@
 /*
  * Flash & Environment
  */
-#ifdef CONFIG_USE_NAND
+#ifdef CONFIG_NAND
 #define CONFIG_NAND_DAVINCI
 #define CONFIG_ENV_OFFSET		0x0 /* Block 0--not used by bootcode */
 #define CONFIG_ENV_SIZE			(128 << 9)

@@ -262,12 +261,12 @@
 #ifndef CONFIG_DRIVER_TI_EMAC
 #endif
 
-#ifdef CONFIG_USE_NAND
+#ifdef CONFIG_NAND
 #define CONFIG_MTD_DEVICE
 #define CONFIG_MTD_PARTITIONS
 #endif
 
-#if !defined(CONFIG_USE_NAND) && \
+#if !defined(CONFIG_NAND) && \
 	!defined(CONFIG_SYS_USE_NOR) && \
 	!defined(CONFIG_USE_SPIFLASH)
 #define CONFIG_ENV_SIZE		(16 << 10)

scripts/config_whitelist.txt +0 -1

index 97e27ae7fe..8ded15c89a 100644
@@ -4418,7 +4418,6 @@ CONFIG_SYS_USE_FLASH
 CONFIG_SYS_USE_MAIN_OSCILLATOR
 CONFIG_SYS_USE_MMC
 CONFIG_SYS_USE_MPC834XSYS_USB_PHY
-CONFIG_SYS_USE_NAND
 CONFIG_SYS_USE_NANDFLASH
 CONFIG_SYS_USE_NOR
 CONFIG_SYS_USE_NORFLASH

Signature · 1 line

2.17.1

Tom Rini

2018-07-23 14:47 UTC #1 lore raw

include/configs/da850evm.h

Quoted 9 lines · Adam Ford

The DA850-EVM and OMAPL138_LCDK both use checks for CONFIG_USE_NAND. This patch changes these checks to CONFIG_NAND which is already defined in Kconfig. Since the OMAPL138_LCDK already had CONFIG_NAND defined in its defconfig, it can be deleted from configs/omapl138_lcdk.h.
Signed-off-by Adam Ford <[email protected]>
include/configs/da850evm.h +0 -0
index ebfdd1c7a3..6690be60b6 100644

Applied to u-boot/master, thanks!

Signature · 8 lines

Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 819 bytes
Desc: not available
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20180723/bc3d8b8d/attachment.sig>