This converts the following to Kconfig: CONFIG_SPL_OMAP3_ID_NAND

Signed-off-by: Adam Ford aford173@gmail.com --- README | 4 ---- arch/arm/mach-omap2/Kconfig | 1 + arch/arm/mach-omap2/omap3/Kconfig | 6 ++++++ include/configs/cm_t35.h | 1 - include/configs/omap3_beagle.h | 1 - include/configs/omap3_cairo.h | 1 - include/configs/omap3_evm.h | 1 - include/configs/omap3_igep00x0.h | 1 - include/configs/omap3_logic.h | 2 -- include/configs/tao3530.h | 1 - scripts/config_whitelist.txt | 1 - 11 files changed, 7 insertions(+), 13 deletions(-)

diff --git a/README b/README index 3735916..22294bf 100644 --- a/README +++ b/README @@ -3028,10 +3028,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 89c91d1..533261c 100644 --- 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 7b298d6..b90cade 100644 --- 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 f8f3c92..31c8389 100644 --- a/include/configs/cm_t35.h +++ b/include/configs/cm_t35.h @@ -260,7 +260,6 @@ #define CONFIG_SPL_NAND_BASE #define CONFIG_SPL_NAND_DRIVERS #define CONFIG_SPL_NAND_ECC -#define CONFIG_SPL_OMAP3_ID_NAND #define CONFIG_SPL_LDSCRIPT "arch/arm/mach-omap2/u-boot-spl.lds"

/* NAND boot config */ diff --git a/include/configs/omap3_beagle.h b/include/configs/omap3_beagle.h index a87a75e..16951bd 100644 --- a/include/configs/omap3_beagle.h +++ b/include/configs/omap3_beagle.h @@ -258,7 +258,6 @@ #define CONFIG_OMAP3_SPI

/* 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 4f8ce54..30eaf50 100644 --- a/include/configs/omap3_cairo.h +++ b/include/configs/omap3_cairo.h @@ -183,7 +183,6 @@ #define CONFIG_OMAP3_SPI

/* 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 bc859c8..234cfe8 100644 --- a/include/configs/omap3_evm.h +++ b/include/configs/omap3_evm.h @@ -305,7 +305,6 @@ #define CONFIG_SPL_BSS_START_ADDR 0x80000000 #define CONFIG_SPL_BSS_MAX_SIZE 0x80000 /* 512 KB */

-#define CONFIG_SPL_OMAP3_ID_NAND #define CONFIG_SPL_LDSCRIPT "arch/arm/mach-omap2/u-boot-spl.lds"

/* diff --git a/include/configs/omap3_igep00x0.h b/include/configs/omap3_igep00x0.h index 39f1e54..5ad354f 100644 --- a/include/configs/omap3_igep00x0.h +++ b/include/configs/omap3_igep00x0.h @@ -97,7 +97,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 e5ffb85..8a26536 100644 --- a/include/configs/omap3_logic.h +++ b/include/configs/omap3_logic.h @@ -259,8 +259,6 @@

/* Defines for SPL */

-#define CONFIG_SPL_OMAP3_ID_NAND - /* NAND: SPL falcon mode configs */ #ifdef CONFIG_SPL_OS_BOOT #define CONFIG_CMD_SPL_NAND_OFS 0x240000 diff --git a/include/configs/tao3530.h b/include/configs/tao3530.h index 1f36ac6..4da0c4b 100644 --- a/include/configs/tao3530.h +++ b/include/configs/tao3530.h @@ -241,7 +241,6 @@ #define CONFIG_SPL_NAND_BASE #define CONFIG_SPL_NAND_DRIVERS #define CONFIG_SPL_NAND_ECC -#define CONFIG_SPL_OMAP3_ID_NAND #define CONFIG_SPL_LDSCRIPT "arch/arm/mach-omap2/u-boot-spl.lds"

/* NAND boot config */ diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index 4689d63..f90e0f7 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -2267,7 +2267,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