diff options
| author | Simon Glass <sjg@chromium.org> | 2016-09-12 23:18:48 -0600 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2016-09-16 17:27:14 -0400 |
| commit | d6b9bd892338357ba8cca41cc971eccccf5dcf4d (patch) | |
| tree | 03a369d947a67986b036f3fbc3b37ef78c2c597f /include | |
| parent | 2fa08508773a1aada8025333b009fe5fde80d831 (diff) | |
| download | u-boot-d6b9bd892338357ba8cca41cc971eccccf5dcf4d.tar.gz | |
Convert CONFIG_SPL_NAND_SUPPORT to Kconfig
Move this option to Kconfig and tidy up existing uses.
Signed-off-by: Simon Glass <sjg@chromium.org>
Diffstat (limited to 'include')
55 files changed, 0 insertions, 63 deletions
diff --git a/include/configs/B4860QDS.h b/include/configs/B4860QDS.h index eac0908ef7..342092a909 100644 --- a/include/configs/B4860QDS.h +++ b/include/configs/B4860QDS.h @@ -31,7 +31,6 @@ #define CONFIG_SPL_MAX_SIZE 0x28000 #define RESET_VECTOR_OFFSET 0x27FFC #define BOOT_PAGE_OFFSET 0x27000 -#define CONFIG_SPL_NAND_SUPPORT #define CONFIG_SYS_NAND_U_BOOT_SIZE (768 << 10) #define CONFIG_SYS_NAND_U_BOOT_DST 0x00200000 #define CONFIG_SYS_NAND_U_BOOT_START 0x00200000 diff --git a/include/configs/BSC9131RDB.h b/include/configs/BSC9131RDB.h index a0ca0db27c..241fa51439 100644 --- a/include/configs/BSC9131RDB.h +++ b/include/configs/BSC9131RDB.h @@ -29,7 +29,6 @@ #ifdef CONFIG_NAND #define CONFIG_SPL_INIT_MINIMAL #define CONFIG_SPL_SERIAL_SUPPORT -#define CONFIG_SPL_NAND_SUPPORT #define CONFIG_SPL_NAND_BOOT #define CONFIG_SPL_FLUSH_IMAGE #define CONFIG_SPL_TARGET "u-boot-with-spl.bin" diff --git a/include/configs/BSC9132QDS.h b/include/configs/BSC9132QDS.h index eb6ddae74b..4662900964 100644 --- a/include/configs/BSC9132QDS.h +++ b/include/configs/BSC9132QDS.h @@ -45,7 +45,6 @@ #ifdef CONFIG_NAND #define CONFIG_SPL_INIT_MINIMAL #define CONFIG_SPL_SERIAL_SUPPORT -#define CONFIG_SPL_NAND_SUPPORT #define CONFIG_SPL_NAND_BOOT #define CONFIG_SPL_FLUSH_IMAGE #define CONFIG_SPL_TARGET "u-boot-with-spl.bin" diff --git a/include/configs/C29XPCIE.h b/include/configs/C29XPCIE.h index 4cb417f2ce..45f12c5c76 100644 --- a/include/configs/C29XPCIE.h +++ b/include/configs/C29XPCIE.h @@ -30,7 +30,6 @@ #define CONFIG_SPL_NAND_INIT #define CONFIG_TPL_SERIAL_SUPPORT #define CONFIG_TPL_DRIVERS_MISC_SUPPORT -#define CONFIG_TPL_NAND_SUPPORT #define CONFIG_SPL_COMMON_INIT_DDR #define CONFIG_SPL_MAX_SIZE (128 << 10) #define CONFIG_SPL_TEXT_BASE 0xf8f81000 @@ -42,7 +41,6 @@ #elif defined(CONFIG_SPL_BUILD) #define CONFIG_SPL_INIT_MINIMAL #define CONFIG_SPL_SERIAL_SUPPORT -#define CONFIG_SPL_NAND_SUPPORT #define CONFIG_SPL_NAND_MINIMAL #define CONFIG_SPL_FLUSH_IMAGE #define CONFIG_SPL_TEXT_BASE 0xff800000 diff --git a/include/configs/MPC8313ERDB.h b/include/configs/MPC8313ERDB.h index 1c4e082d4e..403c31117c 100644 --- a/include/configs/MPC8313ERDB.h +++ b/include/configs/MPC8313ERDB.h @@ -23,7 +23,6 @@ #ifdef CONFIG_NAND #define CONFIG_SPL_INIT_MINIMAL #define CONFIG_SPL_SERIAL_SUPPORT -#define CONFIG_SPL_NAND_SUPPORT #define CONFIG_SPL_FLUSH_IMAGE #define CONFIG_SPL_TARGET "u-boot-with-spl.bin" #define CONFIG_SPL_MPC83XX_WAIT_FOR_NAND diff --git a/include/configs/P1010RDB.h b/include/configs/P1010RDB.h index 510bb69fa4..ab55428b95 100644 --- a/include/configs/P1010RDB.h +++ b/include/configs/P1010RDB.h @@ -74,7 +74,6 @@ #ifdef CONFIG_SECURE_BOOT #define CONFIG_SPL_INIT_MINIMAL #define CONFIG_SPL_SERIAL_SUPPORT -#define CONFIG_SPL_NAND_SUPPORT #define CONFIG_SPL_NAND_BOOT #define CONFIG_SPL_FLUSH_IMAGE #define CONFIG_SPL_TARGET "u-boot-with-spl.bin" @@ -95,7 +94,6 @@ #define CONFIG_SPL_FLUSH_IMAGE #define CONFIG_SPL_NAND_INIT #define CONFIG_TPL_SERIAL_SUPPORT -#define CONFIG_TPL_NAND_SUPPORT #define CONFIG_SPL_COMMON_INIT_DDR #define CONFIG_SPL_MAX_SIZE (128 << 10) #define CONFIG_SPL_TEXT_BASE 0xD0001000 @@ -107,7 +105,6 @@ #elif defined(CONFIG_SPL_BUILD) #define CONFIG_SPL_INIT_MINIMAL #define CONFIG_SPL_SERIAL_SUPPORT -#define CONFIG_SPL_NAND_SUPPORT #define CONFIG_SPL_NAND_MINIMAL #define CONFIG_SPL_FLUSH_IMAGE #define CONFIG_SPL_TEXT_BASE 0xff800000 diff --git a/include/configs/P1022DS.h b/include/configs/P1022DS.h index c4d859a0fe..41bbd91eae 100644 --- a/include/configs/P1022DS.h +++ b/include/configs/P1022DS.h @@ -69,7 +69,6 @@ #define CONFIG_SPL_FLUSH_IMAGE #define CONFIG_SPL_NAND_INIT #define CONFIG_TPL_SERIAL_SUPPORT -#define CONFIG_TPL_NAND_SUPPORT #define CONFIG_SPL_COMMON_INIT_DDR #define CONFIG_SPL_MAX_SIZE (128 << 10) #define CONFIG_SPL_TEXT_BASE 0xf8f81000 @@ -81,7 +80,6 @@ #elif defined(CONFIG_SPL_BUILD) #define CONFIG_SPL_INIT_MINIMAL #define CONFIG_SPL_SERIAL_SUPPORT -#define CONFIG_SPL_NAND_SUPPORT #define CONFIG_SPL_FLUSH_IMAGE #define CONFIG_SPL_TEXT_BASE 0xff800000 #define CONFIG_SPL_MAX_SIZE 4096 diff --git a/include/configs/T102xQDS.h b/include/configs/T102xQDS.h index 845ae1eaae..dcfaa66a3c 100644 --- a/include/configs/T102xQDS.h +++ b/include/configs/T102xQDS.h @@ -61,7 +61,6 @@ #endif #ifdef CONFIG_NAND -#define CONFIG_SPL_NAND_SUPPORT #define CONFIG_SYS_NAND_U_BOOT_SIZE (768 << 10) #define CONFIG_SYS_NAND_U_BOOT_DST 0x00200000 #define CONFIG_SYS_NAND_U_BOOT_START 0x00200000 diff --git a/include/configs/T102xRDB.h b/include/configs/T102xRDB.h index bae4163615..5d879dc7d0 100644 --- a/include/configs/T102xRDB.h +++ b/include/configs/T102xRDB.h @@ -68,7 +68,6 @@ #endif #ifdef CONFIG_NAND -#define CONFIG_SPL_NAND_SUPPORT #define CONFIG_SYS_NAND_U_BOOT_SIZE (768 << 10) #define CONFIG_SYS_NAND_U_BOOT_DST 0x30000000 #define CONFIG_SYS_NAND_U_BOOT_START 0x30000000 diff --git a/include/configs/T104xRDB.h b/include/configs/T104xRDB.h index 5db74f9589..58b5e38d17 100644 --- a/include/configs/T104xRDB.h +++ b/include/configs/T104xRDB.h @@ -61,7 +61,6 @@ $(SRCTREE)/board/freescale/t104xrdb/t1042d4_rcw.cfg #define BOOT_PAGE_OFFSET 0x27000 #ifdef CONFIG_NAND -#define CONFIG_SPL_NAND_SUPPORT #ifdef CONFIG_SECURE_BOOT #define CONFIG_U_BOOT_HDR_SIZE (16 << 10) /* diff --git a/include/configs/T208xQDS.h b/include/configs/T208xQDS.h index 53d00077a9..1508f1d8b5 100644 --- a/include/configs/T208xQDS.h +++ b/include/configs/T208xQDS.h @@ -71,7 +71,6 @@ #endif #ifdef CONFIG_NAND -#define CONFIG_SPL_NAND_SUPPORT #define CONFIG_SYS_NAND_U_BOOT_SIZE (768 << 10) #define CONFIG_SYS_NAND_U_BOOT_DST 0x00200000 #define CONFIG_SYS_NAND_U_BOOT_START 0x00200000 diff --git a/include/configs/T208xRDB.h b/include/configs/T208xRDB.h index 5dacb0018c..28455f3341 100644 --- a/include/configs/T208xRDB.h +++ b/include/configs/T208xRDB.h @@ -60,7 +60,6 @@ #endif #ifdef CONFIG_NAND -#define CONFIG_SPL_NAND_SUPPORT #define CONFIG_SYS_NAND_U_BOOT_SIZE (768 << 10) #define CONFIG_SYS_NAND_U_BOOT_DST 0x00200000 #define CONFIG_SYS_NAND_U_BOOT_START 0x00200000 diff --git a/include/configs/T4240QDS.h b/include/configs/T4240QDS.h index 3fa875c93a..0850b4eff0 100644 --- a/include/configs/T4240QDS.h +++ b/include/configs/T4240QDS.h @@ -37,7 +37,6 @@ #define BOOT_PAGE_OFFSET 0x27000 #ifdef CONFIG_NAND -#define CONFIG_SPL_NAND_SUPPORT #define CONFIG_SYS_NAND_U_BOOT_SIZE (768 << 10) #define CONFIG_SYS_NAND_U_BOOT_DST 0x00200000 #define CONFIG_SYS_NAND_U_BOOT_START 0x00200000 diff --git a/include/configs/am335x_evm.h b/include/configs/am335x_evm.h index 1f43582ddc..0b4d17f332 100644 --- a/include/configs/am335x_evm.h +++ b/include/configs/am335x_evm.h @@ -326,7 +326,6 @@ #if defined(CONFIG_SPL_BUILD) && defined(CONFIG_SPL_USBETH_SUPPORT) /* Remove other SPL modes. */ #undef CONFIG_SPL_YMODEM_SUPPORT -#undef CONFIG_SPL_NAND_SUPPORT #define CONFIG_ENV_IS_NOWHERE #undef CONFIG_ENV_IS_IN_NAND /* disable host part of MUSB in SPL */ diff --git a/include/configs/am335x_sl50.h b/include/configs/am335x_sl50.h index 70c7287f46..3aaa91e730 100644 --- a/include/configs/am335x_sl50.h +++ b/include/configs/am335x_sl50.h @@ -99,7 +99,6 @@ #if defined(CONFIG_SPL_BUILD) && defined(CONFIG_SPL_USBETH_SUPPORT) /* Remove other SPL modes. */ #undef CONFIG_SPL_YMODEM_SUPPORT -#undef CONFIG_SPL_NAND_SUPPORT #define CONFIG_ENV_IS_NOWHERE #undef CONFIG_ENV_IS_IN_NAND /* disable host part of MUSB in SPL */ diff --git a/include/configs/am3517_crane.h b/include/configs/am3517_crane.h index 53ecf6977f..a98aa5866e 100644 --- a/include/configs/am3517_crane.h +++ b/include/configs/am3517_crane.h @@ -288,7 +288,6 @@ #define CONFIG_SPL_FS_LOAD_PAYLOAD_NAME "u-boot.img" #define CONFIG_SPL_SERIAL_SUPPORT -#define CONFIG_SPL_NAND_SUPPORT #define CONFIG_SPL_NAND_BASE #define CONFIG_SPL_NAND_DRIVERS #define CONFIG_SPL_NAND_ECC diff --git a/include/configs/am3517_evm.h b/include/configs/am3517_evm.h index 9d2785624a..7cd8cd00c8 100644 --- a/include/configs/am3517_evm.h +++ b/include/configs/am3517_evm.h @@ -345,7 +345,6 @@ #define CONFIG_SPL_FS_LOAD_PAYLOAD_NAME "u-boot.img" #define CONFIG_SPL_SERIAL_SUPPORT -#define CONFIG_SPL_NAND_SUPPORT #define CONFIG_SPL_NAND_BASE #define CONFIG_SPL_NAND_DRIVERS #define CONFIG_SPL_NAND_ECC diff --git a/include/configs/apf27.h b/include/configs/apf27.h index e84cfb5d43..5c141d0e2b 100644 --- a/include/configs/apf27.h +++ b/include/configs/apf27.h @@ -41,7 +41,6 @@ #define CONFIG_SPL_SERIAL_SUPPORT /* NAND boot config */ -#define CONFIG_SPL_NAND_SUPPORT #define CONFIG_SYS_NAND_U_BOOT_START CONFIG_SYS_TEXT_BASE #define CONFIG_SYS_NAND_U_BOOT_OFFS 0x800 #define CONFIG_SYS_NAND_U_BOOT_DST CONFIG_SYS_TEXT_BASE diff --git a/include/configs/at91sam9m10g45ek.h b/include/configs/at91sam9m10g45ek.h index 5e2521a3bd..62ef059cc2 100644 --- a/include/configs/at91sam9m10g45ek.h +++ b/include/configs/at91sam9m10g45ek.h @@ -204,7 +204,6 @@ #define CONFIG_SPL_FS_LOAD_PAYLOAD_NAME "u-boot.img" #elif CONFIG_SYS_USE_NANDFLASH -#define CONFIG_SPL_NAND_SUPPORT #define CONFIG_SPL_NAND_DRIVERS #define CONFIG_SPL_NAND_BASE #define CONFIG_SPL_NAND_ECC diff --git a/include/configs/at91sam9n12ek.h b/include/configs/at91sam9n12ek.h index 66e570d1ea..a265991795 100644 --- a/include/configs/at91sam9n12ek.h +++ b/include/configs/at91sam9n12ek.h @@ -248,7 +248,6 @@ #define CONFIG_SPL_FS_LOAD_PAYLOAD_NAME "u-boot.img" #elif CONFIG_SYS_USE_NANDFLASH -#define CONFIG_SPL_NAND_SUPPORT #define CONFIG_SPL_NAND_DRIVERS #define CONFIG_SPL_NAND_BASE #define CONFIG_SYS_NAND_U_BOOT_OFFS 0x40000 diff --git a/include/configs/at91sam9x5ek.h b/include/configs/at91sam9x5ek.h index c110dd763f..bc1e7f359d 100644 --- a/include/configs/at91sam9x5ek.h +++ b/include/configs/at91sam9x5ek.h @@ -248,7 +248,6 @@ #define CONFIG_SPL_FS_LOAD_PAYLOAD_NAME "u-boot.img" #elif CONFIG_SYS_USE_NANDFLASH -#define CONFIG_SPL_NAND_SUPPORT #define CONFIG_SPL_NAND_DRIVERS #define CONFIG_SPL_NAND_BASE #define CONFIG_SYS_NAND_U_BOOT_OFFS 0x40000 diff --git a/include/configs/brppt1.h b/include/configs/brppt1.h index b5ea8ba5b5..f33cc20af4 100644 --- a/include/configs/brppt1.h +++ b/include/configs/brppt1.h @@ -88,7 +88,6 @@ #ifdef CONFIG_NAND #define CONFIG_SPL_NAND_AM33XX_BCH /* OMAP4 and later ELM support */ -#define CONFIG_SPL_NAND_SUPPORT #define CONFIG_SPL_NAND_BASE #define CONFIG_SPL_NAND_DRIVERS #define CONFIG_SPL_NAND_ECC diff --git a/include/configs/cm_t35.h b/include/configs/cm_t35.h index 8821821cf6..bda9ab500c 100644 --- a/include/configs/cm_t35.h +++ b/include/configs/cm_t35.h @@ -307,7 +307,6 @@ #define CONFIG_SPL_BOARD_INIT #define CONFIG_SPL_SERIAL_SUPPORT -#define CONFIG_SPL_NAND_SUPPORT #define CONFIG_SPL_NAND_BASE #define CONFIG_SPL_NAND_DRIVERS #define CONFIG_SPL_NAND_ECC diff --git a/include/configs/cm_t43.h b/include/configs/cm_t43.h index e767b85c45..ad3be27321 100644 --- a/include/configs/cm_t43.h +++ b/include/configs/cm_t43.h @@ -91,7 +91,6 @@ #include <configs/ti_armv7_omap.h> #undef CONFIG_SPL_OS_BOOT -#undef CONFIG_SPL_NAND_SUPPORT #undef CONFIG_SYS_MONITOR_LEN #undef CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR diff --git a/include/configs/corvus.h b/include/configs/corvus.h index e1d87f4144..1ee8743c27 100644 --- a/include/configs/corvus.h +++ b/include/configs/corvus.h @@ -163,7 +163,6 @@ #define CONFIG_SPL_SERIAL_SUPPORT #define CONFIG_SPL_BOARD_INIT -#define CONFIG_SPL_NAND_SUPPORT #define CONFIG_SPL_NAND_DRIVERS #define CONFIG_SPL_NAND_BASE #define CONFIG_SPL_NAND_ECC diff --git a/include/configs/da850evm.h b/include/configs/da850evm.h index 358df3eab5..663461e05a 100644 --- a/include/configs/da850evm.h +++ b/include/configs/da850evm.h @@ -205,7 +205,6 @@ #define CONFIG_SYS_NAND_ECCSIZE 512 #define CONFIG_SYS_NAND_ECCBYTES 10 #define CONFIG_SYS_NAND_OOBSIZE 64 -#define CONFIG_SPL_NAND_SUPPORT #define CONFIG_SPL_NAND_BASE #define CONFIG_SPL_NAND_DRIVERS #define CONFIG_SPL_NAND_ECC diff --git a/include/configs/devkit3250.h b/include/configs/devkit3250.h index f428ab3df2..b9df884547 100644 --- a/include/configs/devkit3250.h +++ b/include/configs/devkit3250.h @@ -200,7 +200,6 @@ /* SPL loads an image from NAND */ #define CONFIG_SPL_NAND_SIMPLE #define CONFIG_SPL_NAND_RAW_ONLY -#define CONFIG_SPL_NAND_SUPPORT #define CONFIG_SPL_NAND_DRIVERS #define CONFIG_SPL_NAND_ECC diff --git a/include/configs/gw_ventana.h b/include/configs/gw_ventana.h index a72eeaff45..6e6bd038f1 100644 --- a/include/configs/gw_ventana.h +++ b/include/configs/gw_ventana.h @@ -9,7 +9,6 @@ /* SPL */ #define CONFIG_SPL_BOARD_INIT -#define CONFIG_SPL_NAND_SUPPORT #define CONFIG_SPL_POWER_SUPPORT /* Location in NAND to read U-Boot from */ #define CONFIG_SYS_NAND_U_BOOT_OFFS (14 * SZ_1M) diff --git a/include/configs/ipam390.h b/include/configs/ipam390.h index f77c212ca0..8a491823b3 100644 --- a/include/configs/ipam390.h +++ b/include/configs/ipam390.h @@ -178,7 +178,6 @@ #define CONFIG_SYS_NAND_ECCSIZE 512 #define CONFIG_SYS_NAND_ECCBYTES 10 #define CONFIG_SYS_NAND_OOBSIZE 64 -#define CONFIG_SPL_NAND_SUPPORT #define CONFIG_SPL_NAND_BASE #define CONFIG_SPL_NAND_DRIVERS #define CONFIG_SPL_NAND_ECC diff --git a/include/configs/ls1021aqds.h b/include/configs/ls1021aqds.h index c9c6b31c56..07599616e4 100644 --- a/include/configs/ls1021aqds.h +++ b/include/configs/ls1021aqds.h @@ -100,7 +100,6 @@ unsigned long get_board_ddr_clk(void); #define CONFIG_SPL_LDSCRIPT "arch/$(ARCH)/cpu/u-boot-spl.lds" #define CONFIG_SPL_WATCHDOG_SUPPORT #define CONFIG_SPL_SERIAL_SUPPORT -#define CONFIG_SPL_NAND_SUPPORT #define CONFIG_SPL_TEXT_BASE 0x10000000 #define CONFIG_SPL_MAX_SIZE 0x1a000 diff --git a/include/configs/ls1043a_common.h b/include/configs/ls1043a_common.h index 525f3c0074..4b99d52ce5 100644 --- a/include/configs/ls1043a_common.h +++ b/include/configs/ls1043a_common.h @@ -86,7 +86,6 @@ #define CONFIG_SPL_TARGET "u-boot-with-spl.bin" #define CONFIG_SPL_WATCHDOG_SUPPORT #define CONFIG_SPL_SERIAL_SUPPORT -#define CONFIG_SPL_NAND_SUPPORT #define CONFIG_SPL_TEXT_BASE 0x10000000 #define CONFIG_SPL_MAX_SIZE 0x1a000 #define CONFIG_SPL_STACK 0x1001d000 diff --git a/include/configs/ls2080a_common.h b/include/configs/ls2080a_common.h index 8a34c6b1b9..d551edf905 100644 --- a/include/configs/ls2080a_common.h +++ b/include/configs/ls2080a_common.h @@ -268,7 +268,6 @@ unsigned long long get_qixis_addr(void); #define CONFIG_SPL_FRAMEWORK #define CONFIG_SPL_LDSCRIPT "arch/arm/cpu/armv8/u-boot-spl.lds" #define CONFIG_SPL_MAX_SIZE 0x16000 -#define CONFIG_SPL_NAND_SUPPORT #define CONFIG_SPL_SERIAL_SUPPORT #define CONFIG_SPL_STACK (CONFIG_SYS_FSL_OCRAM_BASE + 0x9ff0) #define CONFIG_SPL_TARGET "u-boot-with-spl.bin" diff --git a/include/configs/m53evk.h b/include/configs/m53evk.h index 3aa6987804..9040e68969 100644 --- a/include/configs/m53evk.h +++ b/include/configs/m53evk.h @@ -239,7 +239,6 @@ #define CONFIG_SPL_TEXT_BASE 0x70008000 #define CONFIG_SPL_PAD_TO 0x8000 #define CONFIG_SPL_STACK 0x70004000 -#define CONFIG_SPL_NAND_SUPPORT #define CONFIG_SPL_SERIAL_SUPPORT #define CONFIG_SYS_NAND_U_BOOT_OFFS CONFIG_SPL_PAD_TO diff --git a/include/configs/mcx.h b/include/configs/mcx.h index 62ee5880a9..dc52df2f90 100644 --- a/include/configs/mcx.h +++ b/include/configs/mcx.h @@ -322,7 +322,6 @@ #define CONFIG_SPL_SERIAL_SUPPORT #define CONFIG_SPL_POWER_SUPPORT -#define CONFIG_SPL_NAND_SUPPORT #define CONFIG_SPL_NAND_BASE #define CONFIG_SPL_NAND_DRIVERS #define CONFIG_SPL_NAND_ECC diff --git a/include/configs/mx31pdk.h b/include/configs/mx31pdk.h index 3ef09a0402..899698da08 100644 --- a/include/configs/mx31pdk.h +++ b/include/configs/mx31pdk.h @@ -31,7 +31,6 @@ #define CONFIG_SPL_TARGET "u-boot-with-spl.bin" #define CONFIG_SPL_LDSCRIPT "arch/$(ARCH)/cpu/u-boot-spl.lds" #define CONFIG_SPL_MAX_SIZE 2048 -#define CONFIG_SPL_NAND_SUPPORT #define CONFIG_SPL_SERIAL_SUPPORT #define CONFIG_SPL_TEXT_BASE 0x87dc0000 diff --git a/include/configs/omap3_evm.h b/include/configs/omap3_evm.h index 979575727a..d19f8710ca 100644 --- a/include/configs/omap3_evm.h +++ b/include/configs/omap3_evm.h @@ -76,7 +76,6 @@ /* NAND SPL */ #define CONFIG_SPL_NAND_SIMPLE -#define CONFIG_SPL_NAND_SUPPORT #define CONFIG_SPL_NAND_BASE #define CONFIG_SPL_NAND_DRIVERS #define CONFIG_SPL_NAND_ECC diff --git a/include/configs/omap3_igep00x0.h b/include/configs/omap3_igep00x0.h index 0aee437c86..dc9c80f8be 100644 --- a/include/configs/omap3_igep00x0.h +++ b/include/configs/omap3_igep00x0.h @@ -122,7 +122,6 @@ #define CONFIG_SYS_ONENAND_BLOCK_SIZE (128*1024) /* NAND config */ -#define CONFIG_SPL_NAND_SUPPORT #define CONFIG_SPL_OMAP3_ID_NAND #define CONFIG_SYS_NAND_BUSWIDTH_16BIT #define CONFIG_SYS_NAND_5_ADDR_CYCLE diff --git a/include/configs/p1_p2_rdb_pc.h b/include/configs/p1_p2_rdb_pc.h index 8466b33efb..d2d60ef1b5 100644 --- a/include/configs/p1_p2_rdb_pc.h +++ b/include/configs/p1_p2_rdb_pc.h @@ -232,7 +232,6 @@ #define CONFIG_SPL_FLUSH_IMAGE #define CONFIG_SPL_NAND_INIT #define CONFIG_TPL_SERIAL_SUPPORT -#define CONFIG_TPL_NAND_SUPPORT #define CONFIG_SPL_COMMON_INIT_DDR #define CONFIG_SPL_MAX_SIZE (128 << 10) #define CONFIG_SPL_TEXT_BASE 0xf8f81000 @@ -244,7 +243,6 @@ #elif defined(CONFIG_SPL_BUILD) #define CONFIG_SPL_INIT_MINIMAL #define CONFIG_SPL_SERIAL_SUPPORT -#define CONFIG_SPL_NAND_SUPPORT #define CONFIG_SPL_FLUSH_IMAGE #define CONFIG_SPL_TARGET "u-boot-with-spl.bin" #define CONFIG_SPL_TEXT_BASE 0xff800000 diff --git a/include/configs/platinum.h b/include/configs/platinum.h index b007b724df..e34cf3dfe6 100644 --- a/include/configs/platinum.h +++ b/include/configs/platinum.h @@ -8,7 +8,6 @@ #define __PLATINUM_CONFIG_H__ /* SPL */ -#define CONFIG_SPL_NAND_SUPPORT /* Location in NAND to read U-Boot from */ #define CONFIG_SYS_NAND_U_BOOT_OFFS (14 * 1024 * 1024) diff --git a/include/configs/sama5d2_ptc.h b/include/configs/sama5d2_ptc.h index 7a193a7d15..e928a3b67f 100644 --- a/include/configs/sama5d2_ptc.h +++ b/include/configs/sama5d2_ptc.h @@ -133,7 +133,6 @@ #define CONFIG_SYS_SPI_U_BOOT_OFFS 0x8000 #elif CONFIG_SYS_USE_NANDFLASH -#define CONFIG_SPL_NAND_SUPPORT #define CONFIG_SPL_NAND_DRIVERS #define CONFIG_SPL_NAND_BASE #define CONFIG_PMECC_CAP 8 diff --git a/include/configs/sama5d3_xplained.h b/include/configs/sama5d3_xplained.h index f07c361070..abbe2c9fcf 100644 --- a/include/configs/sama5d3_xplained.h +++ b/include/configs/sama5d3_xplained.h @@ -137,7 +137,6 @@ #define CONFIG_SPL_FS_LOAD_PAYLOAD_NAME "u-boot.img" #elif CONFIG_SYS_USE_NANDFLASH -#define CONFIG_SPL_NAND_SUPPORT #define CONFIG_SPL_NAND_DRIVERS #define CONFIG_SPL_NAND_BASE #define CONFIG_SYS_NAND_U_BOOT_OFFS 0x40000 diff --git a/include/configs/sama5d3xek.h b/include/configs/sama5d3xek.h index fcc3e13e3f..558cf6cdb1 100644 --- a/include/configs/sama5d3xek.h +++ b/include/configs/sama5d3xek.h @@ -177,7 +177,6 @@ #define CONFIG_SPL_FS_LOAD_PAYLOAD_NAME "u-boot.img" #elif CONFIG_SYS_USE_NANDFLASH -#define CONFIG_SPL_NAND_SUPPORT #define CONFIG_SPL_NAND_DRIVERS #define CONFIG_SPL_NAND_BASE #define CONFIG_SYS_NAND_U_BOOT_OFFS 0x40000 diff --git a/include/configs/sama5d4_xplained.h b/include/configs/sama5d4_xplained.h index 074d31d949..3e06aaf11b 100644 --- a/include/configs/sama5d4_xplained.h +++ b/include/configs/sama5d4_xplained.h @@ -137,7 +137,6 @@ #define CONFIG_SPL_FS_LOAD_PAYLOAD_NAME "u-boot.img" #elif CONFIG_SYS_USE_NANDFLASH -#define CONFIG_SPL_NAND_SUPPORT #define CONFIG_SPL_NAND_DRIVERS #define CONFIG_SPL_NAND_BASE #define CONFIG_PMECC_CAP 8 diff --git a/include/configs/sama5d4ek.h b/include/configs/sama5d4ek.h index 88c9ba21e8..bfeabe2257 100644 --- a/include/configs/sama5d4ek.h +++ b/include/configs/sama5d4ek.h @@ -135,7 +135,6 @@ #define CONFIG_SPL_FS_LOAD_PAYLOAD_NAME "u-boot.img" #elif CONFIG_SYS_USE_NANDFLASH -#define CONFIG_SPL_NAND_SUPPORT #define CONFIG_SPL_NAND_DRIVERS #define CONFIG_SPL_NAND_BASE #define CONFIG_PMECC_CAP 8 diff --git a/include/configs/siemens-am33x-common.h b/include/configs/siemens-am33x-common.h index ec4f0843d2..d1f74538d8 100644 --- a/include/configs/siemens-am33x-common.h +++ b/include/configs/siemens-am33x-common.h @@ -149,7 +149,6 @@ #define CONFIG_SPL_BOARD_INIT #define CONFIG_SPL_NAND_AM33XX_BCH -#define CONFIG_SPL_NAND_SUPPORT #define CONFIG_SPL_NAND_BASE #define CONFIG_SPL_NAND_DRIVERS #define CONFIG_SPL_NAND_ECC diff --git a/include/configs/smartweb.h b/include/configs/smartweb.h index 297cf08ae9..1ea41a22cb 100644 --- a/include/configs/smartweb.h +++ b/include/configs/smartweb.h @@ -241,7 +241,6 @@ #define CONFIG_SPL_BOARD_INIT #define CONFIG_SYS_NAND_ENABLE_PIN_SPL (2*32 + 14) -#define CONFIG_SPL_NAND_SUPPORT #define CONFIG_SYS_USE_NANDFLASH 1 #define CONFIG_SPL_NAND_DRIVERS #define CONFIG_SPL_NAND_BASE diff --git a/include/configs/socfpga_common.h b/include/configs/socfpga_common.h index d6cb7e3b06..989149c7cb 100644 --- a/include/configs/socfpga_common.h +++ b/include/configs/socfpga_common.h @@ -327,9 +327,6 @@ unsigned int cm_get_qspi_controller_clk_hz(void); #ifdef CONFIG_DM_SPI #define CONFIG_SPL_SPI_SUPPORT #endif -#ifdef CONFIG_SPL_NAND_DENALI -#define CONFIG_SPL_NAND_SUPPORT -#endif /* SPL SDMMC boot support */ #ifdef CONFIG_SPL_MMC_SUPPORT diff --git a/include/configs/sunxi-common.h b/include/configs/sunxi-common.h index a1a4aaa908..6aadca89b9 100644 --- a/include/configs/sunxi-common.h +++ b/include/configs/sunxi-common.h @@ -134,7 +134,6 @@ #ifdef CONFIG_NAND_SUNXI #define CONFIG_SYS_NAND_MAX_ECCPOS 1664 -#define CONFIG_SPL_NAND_SUPPORT 1 #define CONFIG_SYS_NAND_ONFI_DETECTION #define CONFIG_SYS_MAX_NAND_DEVICE 8 #endif diff --git a/include/configs/tam3517-common.h b/include/configs/tam3517-common.h index c0e92c556b..bd65e058a7 100644 --- a/include/configs/tam3517-common.h +++ b/include/configs/tam3517-common.h @@ -203,7 +203,6 @@ #define CONFIG_SPL_SERIAL_SUPPORT #define CONFIG_SPL_POWER_SUPPORT -#define CONFIG_SPL_NAND_SUPPORT #define CONFIG_SPL_NAND_BASE #define CONFIG_SPL_NAND_DRIVERS #define CONFIG_SPL_NAND_ECC diff --git a/include/configs/tao3530.h b/include/configs/tao3530.h index 8caf552627..6ed4a64c0a 100644 --- a/include/configs/tao3530.h +++ b/include/configs/tao3530.h @@ -289,7 +289,6 @@ #define CONFIG_SPL_BOARD_INIT #define CONFIG_SPL_SERIAL_SUPPORT -#define CONFIG_SPL_NAND_SUPPORT #define CONFIG_SPL_NAND_BASE #define CONFIG_SPL_NAND_DRIVERS #define CONFIG_SPL_NAND_ECC diff --git a/include/configs/taurus.h b/include/configs/taurus.h index 05f00c5c07..bf8e19fba7 100644 --- a/include/configs/taurus.h +++ b/include/configs/taurus.h @@ -262,7 +262,6 @@ #define CONFIG_SPL_BOARD_INIT #define CONFIG_SYS_NAND_ENABLE_PIN_SPL (2*32 + 14) -#define CONFIG_SPL_NAND_SUPPORT #define CONFIG_SYS_USE_NANDFLASH 1 #define CONFIG_SPL_NAND_DRIVERS #define CONFIG_SPL_NAND_BASE diff --git a/include/configs/ti_armv7_common.h b/include/configs/ti_armv7_common.h index f83655d82e..a62f5b5999 100644 --- a/include/configs/ti_armv7_common.h +++ b/include/configs/ti_armv7_common.h @@ -268,7 +268,6 @@ #define CONFIG_SPL_BOARD_INIT #ifdef CONFIG_NAND -#define CONFIG_SPL_NAND_SUPPORT #define CONFIG_SPL_NAND_BASE #define CONFIG_SPL_NAND_DRIVERS #define CONFIG_SPL_NAND_ECC diff --git a/include/configs/tricorder.h b/include/configs/tricorder.h index fb453acd50..a36c431406 100644 --- a/include/configs/tricorder.h +++ b/include/configs/tricorder.h @@ -321,7 +321,6 @@ #define CONFIG_SPL_BOARD_INIT #define CONFIG_SPL_SERIAL_SUPPORT #define CONFIG_SPL_POWER_SUPPORT -#define CONFIG_SPL_NAND_SUPPORT #define CONFIG_SPL_NAND_BASE #define CONFIG_SPL_NAND_DRIVERS #define CONFIG_SPL_NAND_ECC diff --git a/include/configs/uniphier.h b/include/configs/uniphier.h index 441496088d..a85142e040 100644 --- a/include/configs/uniphier.h +++ b/include/configs/uniphier.h @@ -281,8 +281,6 @@ #define CONFIG_SPL_NOR_SUPPORT #ifdef CONFIG_ARM64 #define CONFIG_SPL_BOARD_LOAD_IMAGE -#else -#define CONFIG_SPL_NAND_SUPPORT #endif #define CONFIG_SPL_BOARD_INIT diff --git a/include/configs/work_92105.h b/include/configs/work_92105.h index 4d44de8e9b..8bf2444723 100644 --- a/include/configs/work_92105.h +++ b/include/configs/work_92105.h @@ -191,7 +191,6 @@ /* SPL will use serial */ #define CONFIG_SPL_SERIAL_SUPPORT /* SPL will load U-Boot from NAND offset 0x40000 */ -#define CONFIG_SPL_NAND_SUPPORT #define CONFIG_SPL_NAND_DRIVERS #define CONFIG_SPL_NAND_BASE #define CONFIG_SPL_NAND_BOOT |