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 <aford173@gmail.com>

diff --git a/include/configs/da850evm.h b/include/configs/da850evm.h
index 006cd03c00a1836877a0cb0d3b469bd828404b56..973a32276955d06a298e099dd8ee7af6c7e534ab 100644 (file)
--- a/include/configs/da850evm.h
+++ b/include/configs/da850evm.h
@@ -148,7 +148,7 @@
 /*
  * Flash & Environment
  */
-#ifdef CONFIG_USE_NAND
+#ifdef CONFIG_NAND
 #define CONFIG_ENV_OFFSET              0x0 /* Block 0--not used by bootcode */
 #define CONFIG_ENV_SIZE                        (128 << 10)
 #define        CONFIG_SYS_NAND_USE_FLASH_BBT
@@ -272,12 +272,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)

diff --git a/include/configs/omapl138_lcdk.h b/include/configs/omapl138_lcdk.h
index f34e35e20a8816ddccce84c69f34aa9412a64d38..85d6b03749797f144069eeac248da46883aa61f8 100644 (file)
--- a/include/configs/omapl138_lcdk.h
+++ b/include/configs/omapl138_lcdk.h
@@ -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_ENV_OFFSET              0x0 /* Block 0--not used by bootcode */
 #define CONFIG_ENV_SIZE                        (128 << 9)
 #define        CONFIG_SYS_NAND_USE_FLASH_BBT
@@ -258,12 +257,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_SYS_USE_NOR) && \
        !defined(CONFIG_USE_SPIFLASH)
 #define CONFIG_ENV_SIZE                (16 << 10)

diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt
index d6d4fb90d7b70f6f9e3985e4b347350c7c11e0c3..8e137c7d0acf0e517dfe378569c53ba42c9ee71f 100644 (file)
--- a/scripts/config_whitelist.txt
+++ b/scripts/config_whitelist.txt
@@ -4675,7 +4675,6 @@ CONFIG_USB_XHCI_KEYSTONE
 CONFIG_USB_XHCI_OMAP
 CONFIG_USER_LOWLEVEL_INIT
 CONFIG_USE_INTERRUPT
-CONFIG_USE_NAND
 CONFIG_USE_NOR
 CONFIG_USE_ONENAND_BOARD_INIT
 CONFIG_USE_SPIFLASH