Convert CONFIG_SPL_OMAP3_ID_NAND to Kconfig

This converts the following to Kconfig:
   CONFIG_SPL_OMAP3_ID_NAND

Signed-off-by: Adam Ford <aford173@gmail.com>
Reviewed-by: Simon Glass <sjg@chromium.org>

diff --git a/README b/README
index 1b31d0e58f5fe2910ad9fa536cc3710974df604e..fc40ddfb27604ade74c216aa6328b8bb2a56f5f5 100644 (file)
--- a/README
+++ b/README
@@ -2835,10 +2835,6 @@ FIT uImage format:
                Define this if you need to first read the OOB and then the
                data. This is used, for example, on davinci platforms.
 
-               CONFIG_SPL_OMAP3_ID_NAND
-               Support for an OMAP3-specific set of functions to return the
-               ID and MFR of the first attached NAND chip, if present.
-
                CONFIG_SPL_RAM_DEVICE
                Support for running image already present in ram, in SPL binary
 

diff --git a/arch/arm/mach-omap2/Kconfig b/arch/arm/mach-omap2/Kconfig
index 72832ad09944440c040d3d1649042b1ef5dac306..7efef6b84b37e2289a99831a360484a8d5fc17a2 100644 (file)
--- a/arch/arm/mach-omap2/Kconfig
+++ b/arch/arm/mach-omap2/Kconfig
@@ -20,6 +20,7 @@ config OMAP34XX
        imply SPL_LIBGENERIC_SUPPORT
        imply SPL_MMC_SUPPORT
        imply SPL_NAND_SUPPORT
+       imply SPL_OMAP3_ID_NAND
        imply SPL_POWER_SUPPORT
        imply SPL_SERIAL_SUPPORT
        imply SYS_I2C_OMAP24XX

diff --git a/arch/arm/mach-omap2/omap3/Kconfig b/arch/arm/mach-omap2/omap3/Kconfig
index 7b298d671dd5e12129f6d5abafc503f83f59069e..b90cadef8f10c90dfbd813285153ccb54f64b205 100644 (file)
--- a/arch/arm/mach-omap2/omap3/Kconfig
+++ b/arch/arm/mach-omap2/omap3/Kconfig
@@ -149,6 +149,12 @@ config TARGET_SNIPER
 
 endchoice
 
+config SPL_OMAP3_ID_NAND
+       bool "Support OMAP3-specific ID and MFR function"
+       help
+         Support for an OMAP3-specific set of functions to return the
+         ID and MFR of the first attached NAND chip, if present.
+
 config SYS_SOC
        default "omap3"
 

diff --git a/include/configs/cm_t35.h b/include/configs/cm_t35.h
index a94d55fa3abe5e11eecc90923cd25f24fde332a9..e0f5765ecaf1cbd5704ed05bfc4bdf57df8162e8 100644 (file)
--- a/include/configs/cm_t35.h
+++ b/include/configs/cm_t35.h
@@ -258,7 +258,6 @@
 #define CONFIG_SPL_NAND_BASE
 #define CONFIG_SPL_NAND_DRIVERS
 #define CONFIG_SPL_NAND_ECC
-#define CONFIG_SPL_OMAP3_ID_NAND
 
 /* NAND boot config */
 #define CONFIG_SYS_NAND_5_ADDR_CYCLE

diff --git a/include/configs/omap3_beagle.h b/include/configs/omap3_beagle.h
index 89880916e5236135a926716fb5c4a97246288d24..26e2c8dc183bf8824fffe0451332abb755b3f139 100644 (file)
--- a/include/configs/omap3_beagle.h
+++ b/include/configs/omap3_beagle.h
@@ -251,7 +251,6 @@
 #define CONFIG_ENV_ADDR                        SMNAND_ENV_OFFSET
 
 /* Defines for SPL */
-#define CONFIG_SPL_OMAP3_ID_NAND
 
 /* NAND boot config */
 #define CONFIG_SYS_NAND_BUSWIDTH_16BIT

diff --git a/include/configs/omap3_cairo.h b/include/configs/omap3_cairo.h
index 560e50081f086289f7286d635db86dbe83b98c01..b4d7f171318b4940b5dd01bb45ae41b8af622c28 100644 (file)
--- a/include/configs/omap3_cairo.h
+++ b/include/configs/omap3_cairo.h
@@ -177,7 +177,6 @@
 #define CONFIG_ENV_ADDR                        SMNAND_ENV_OFFSET
 
 /* Defines for SPL */
-#define CONFIG_SPL_OMAP3_ID_NAND
 
 /* NAND boot config */
 #define CONFIG_SYS_NAND_5_ADDR_CYCLE

diff --git a/include/configs/omap3_evm.h b/include/configs/omap3_evm.h
index 993048340634dab2cf61c3f6d8b7b52fc90cbc05..3f4824259cbc78522818a28098c9e46b37420dc4 100644 (file)
--- a/include/configs/omap3_evm.h
+++ b/include/configs/omap3_evm.h
@@ -73,7 +73,6 @@
 #define CONFIG_ENV_OFFSET               SMNAND_ENV_OFFSET
 #define CONFIG_ENV_ADDR                 SMNAND_ENV_OFFSET
 #define CONFIG_ENV_OVERWRITE
-#define CONFIG_SPL_OMAP3_ID_NAND
 #define CONFIG_MTD_DEVICE               /* needed for mtdparts commands */
 #define CONFIG_MTD_PARTITIONS           /* required for UBI partition support */
 #endif /* CONFIG_NAND */

diff --git a/include/configs/omap3_igep00x0.h b/include/configs/omap3_igep00x0.h
index dc137dbd41a9b6d6ef2768340f6245f629a24a5b..c75027b411e67f5351a4861169f496e3fab2eca0 100644 (file)
--- a/include/configs/omap3_igep00x0.h
+++ b/include/configs/omap3_igep00x0.h
@@ -119,7 +119,6 @@
 #define CONFIG_SYS_ONENAND_BLOCK_SIZE  (128*1024)
 
 /* NAND config */
-#define CONFIG_SPL_OMAP3_ID_NAND
 #define CONFIG_SYS_NAND_BUSWIDTH_16BIT
 #define CONFIG_SYS_NAND_5_ADDR_CYCLE
 #define CONFIG_SYS_NAND_PAGE_COUNT     64

diff --git a/include/configs/omap3_logic.h b/include/configs/omap3_logic.h
index 67b5562da18fa8b5a5948a07119a4c9586dee9b7..bdd4bb6c1967376d8acda1d2dcaa9a952874938a 100644 (file)
--- a/include/configs/omap3_logic.h
+++ b/include/configs/omap3_logic.h
@@ -253,8 +253,6 @@
 
 /* Defines for SPL */
 
-#define CONFIG_SPL_OMAP3_ID_NAND
-
 /* NAND: SPL falcon mode configs */
 #ifdef CONFIG_SPL_OS_BOOT
 #define CONFIG_SYS_NAND_SPL_KERNEL_OFFS        0x280000

diff --git a/include/configs/tao3530.h b/include/configs/tao3530.h
index d47dc8bba909bc1c137e247599986e4e611da853..9f6e243ef517d30e3ee1e54b8345ad749789b448 100644 (file)
--- a/include/configs/tao3530.h
+++ b/include/configs/tao3530.h
@@ -239,7 +239,6 @@
 #define CONFIG_SPL_NAND_BASE
 #define CONFIG_SPL_NAND_DRIVERS
 #define CONFIG_SPL_NAND_ECC
-#define CONFIG_SPL_OMAP3_ID_NAND
 
 /* NAND boot config */
 #define CONFIG_SYS_NAND_5_ADDR_CYCLE

diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt
index 4651bb55e780a8fa590b579106421a1018b28d0e..648f83c6fb12d66fed871295b107b21df256b8f9 100644 (file)
--- a/scripts/config_whitelist.txt
+++ b/scripts/config_whitelist.txt
@@ -2223,7 +2223,6 @@ CONFIG_SPL_NAND_SIMPLE
 CONFIG_SPL_NAND_SOFTECC
 CONFIG_SPL_NAND_WORKSPACE
 CONFIG_SPL_NO_CPU_SUPPORT_CODE
-CONFIG_SPL_OMAP3_ID_NAND
 CONFIG_SPL_PAD_TO
 CONFIG_SPL_PANIC_ON_RAW_IMAGE
 CONFIG_SPL_PBL_PAD