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>
7 years ago · edd1653f04
parent fc760cc6e8
commit edd1653f04
11 changed files with 7 additions and 13 deletions
--- a/4
+++ b/4
@ -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

--- 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
--- 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"

--- 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
--- 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
--- 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
--- 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 */
--- 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
--- 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
--- 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
--- 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