From 38791064142776c635fa3279dde4990eaed5fe35 Mon Sep 17 00:00:00 2001 From: Adam Ford <aford173@gmail.com> Date: Fri, 3 Jul 2020 08:09:45 -0500 Subject: [PATCH] Convert CONFIG_SPL_NAND_BASE et al to Kconfig This converts the following to Kconfig: CONFIG_SPL_NAND_BASE CONFIG_SPL_NAND_IDENT Signed-off-by: Adam Ford <aford173@gmail.com> --- README | 2 -- common/spl/Kconfig | 12 ++++++++++++ configs/am335x_baltos_defconfig | 1 + configs/am335x_evm_defconfig | 1 + configs/am335x_guardian_defconfig | 1 + configs/am335x_hs_evm_defconfig | 1 + configs/am335x_hs_evm_uart_defconfig | 1 + configs/am335x_igep003x_defconfig | 1 + configs/am335x_sl50_defconfig | 1 + configs/am3517_crane_defconfig | 1 + configs/am3517_evm_defconfig | 1 + configs/am43xx_evm_defconfig | 1 + configs/am43xx_evm_rtconly_defconfig | 1 + configs/am43xx_evm_usbhost_boot_defconfig | 1 + configs/am43xx_hs_evm_defconfig | 1 + configs/axm_defconfig | 1 + configs/brppt1_nand_defconfig | 1 + configs/chiliboard_defconfig | 1 + configs/cm_t335_defconfig | 1 + configs/cm_t43_defconfig | 1 + configs/corvus_defconfig | 1 + configs/da850evm_nand_defconfig | 1 + configs/devkit8000_defconfig | 1 + configs/dra7xx_evm_defconfig | 1 + configs/dra7xx_hs_evm_defconfig | 1 + configs/draco_defconfig | 1 + configs/etamin_defconfig | 1 + configs/gardena-smart-gateway-at91sam_defconfig | 1 + configs/igep00x0_defconfig | 1 + configs/k2e_evm_defconfig | 1 + configs/k2g_evm_defconfig | 1 + configs/k2hk_evm_defconfig | 1 + configs/k2l_evm_defconfig | 1 + configs/omap35_logic_defconfig | 1 + configs/omap35_logic_somlv_defconfig | 1 + configs/omap3_beagle_defconfig | 1 + configs/omap3_evm_defconfig | 1 + configs/omap3_ha_defconfig | 1 + configs/omap3_logic_defconfig | 1 + configs/omap3_logic_somlv_defconfig | 1 + configs/omapl138_lcdk_defconfig | 1 + configs/phycore-am335x-r2-wega_defconfig | 1 + configs/pxm2_defconfig | 1 + configs/rastaban_defconfig | 1 + configs/rut_defconfig | 1 + configs/sama5d3_xplained_nandflash_defconfig | 1 + configs/sama5d3xek_nandflash_defconfig | 1 + configs/sama5d4_xplained_nandflash_defconfig | 1 + configs/sama5d4ek_nandflash_defconfig | 1 + configs/smartweb_defconfig | 1 + configs/tao3530_defconfig | 1 + configs/taurus_defconfig | 1 + configs/thuban_defconfig | 1 + configs/ti816x_evm_defconfig | 1 + configs/tricorder_defconfig | 1 + configs/tricorder_flash_defconfig | 1 + configs/wb45n_defconfig | 1 + configs/wb50n_defconfig | 1 + configs/work_92105_defconfig | 1 + include/configs/am3517_crane.h | 2 -- include/configs/am3517_evm.h | 2 -- include/configs/at91sam9m10g45ek.h | 1 - include/configs/at91sam9n12ek.h | 2 -- include/configs/at91sam9x5ek.h | 2 -- include/configs/brppt1.h | 1 - include/configs/corvus.h | 1 - include/configs/da850evm.h | 1 - include/configs/gardena-smart-gateway-at91sam.h | 1 - include/configs/omapl138_lcdk.h | 1 - include/configs/pm9g45.h | 1 - include/configs/sama5d3_xplained.h | 3 --- include/configs/sama5d3xek.h | 2 -- include/configs/sama5d4_xplained.h | 2 -- include/configs/sama5d4ek.h | 2 -- include/configs/siemens-am33x-common.h | 1 - include/configs/smartweb.h | 1 - include/configs/tam3517-common.h | 2 -- include/configs/tao3530.h | 2 -- include/configs/taurus.h | 1 - include/configs/ti_armv7_common.h | 1 - include/configs/tricorder.h | 1 - include/configs/wb45n.h | 1 - include/configs/wb50n.h | 1 - include/configs/work_92105.h | 1 - scripts/config_whitelist.txt | 2 -- 85 files changed, 69 insertions(+), 40 deletions(-) diff --git a/README b/README index afb65597d9..78f20e901f 100644 --- a/README +++ b/README @@ -2281,8 +2281,6 @@ The following options need to be configured: CONFIG_SPL_SKIP_RELOCATE Avoid SPL relocation - CONFIG_SPL_NAND_BASE - Include nand_base.c in the SPL. Requires CONFIG_SPL_NAND_IDENT SPL uses the chip ID list to identify the NAND flash. Requires CONFIG_SPL_NAND_BASE. diff --git a/common/spl/Kconfig b/common/spl/Kconfig index 1a5cf13d9d..dcc1a95139 100644 --- a/common/spl/Kconfig +++ b/common/spl/Kconfig @@ -752,6 +752,18 @@ config SPL_NAND_SIMPLE Support for NAND boot using simple NAND drivers that expose the cmd_ctrl() interface. +config SPL_NAND_BASE + depends on SPL_NAND_DRIVERS + bool "Use Base NAND Driver" + help + Include nand_base.c in the SPL. + +config SPL_NAND_IDENT + depends on SPL_NAND_BASE + bool "Use chip ID to identify NAND flash" + help + SPL uses the chip ID list to identify the NAND flash. + config SPL_UBI bool "Support UBI" help diff --git a/configs/am335x_baltos_defconfig b/configs/am335x_baltos_defconfig index 40d9e003d0..9245a922d4 100644 --- a/configs/am335x_baltos_defconfig +++ b/configs/am335x_baltos_defconfig @@ -23,6 +23,7 @@ CONFIG_SPL_I2C_SUPPORT=y CONFIG_SPL_MTD_SUPPORT=y CONFIG_SPL_NAND_DRIVERS=y CONFIG_SPL_NAND_ECC=y +CONFIG_SPL_NAND_BASE=y CONFIG_SPL_POWER_SUPPORT=y CONFIG_SPL_WATCHDOG_SUPPORT=y CONFIG_SPL_YMODEM_SUPPORT=y diff --git a/configs/am335x_evm_defconfig b/configs/am335x_evm_defconfig index ea9f1dfef7..57bd6be226 100644 --- a/configs/am335x_evm_defconfig +++ b/configs/am335x_evm_defconfig @@ -20,6 +20,7 @@ CONFIG_SPL_MTD_SUPPORT=y CONFIG_SPL_MUSB_NEW_SUPPORT=y CONFIG_SPL_NAND_DRIVERS=y CONFIG_SPL_NAND_ECC=y +CONFIG_SPL_NAND_BASE=y CONFIG_SPL_NET_SUPPORT=y CONFIG_SPL_NET_VCI_STRING="AM335x U-Boot SPL" CONFIG_SPL_OS_BOOT=y diff --git a/configs/am335x_guardian_defconfig b/configs/am335x_guardian_defconfig index 2b28cce409..c98bb61a5f 100644 --- a/configs/am335x_guardian_defconfig +++ b/configs/am335x_guardian_defconfig @@ -30,6 +30,7 @@ CONFIG_SPL_I2C_SUPPORT=y CONFIG_SPL_MUSB_NEW_SUPPORT=y CONFIG_SPL_NAND_DRIVERS=y CONFIG_SPL_NAND_ECC=y +CONFIG_SPL_NAND_BASE=y CONFIG_SPL_NET_SUPPORT=y CONFIG_SPL_NET_VCI_STRING="Guardian U-Boot SPL" CONFIG_SPL_POWER_SUPPORT=y diff --git a/configs/am335x_hs_evm_defconfig b/configs/am335x_hs_evm_defconfig index 3a88a6bd01..f97ecac084 100644 --- a/configs/am335x_hs_evm_defconfig +++ b/configs/am335x_hs_evm_defconfig @@ -24,6 +24,7 @@ CONFIG_SPL_MTD_SUPPORT=y # CONFIG_SPL_NAND_SUPPORT is not set CONFIG_SPL_NAND_DRIVERS=y CONFIG_SPL_NAND_ECC=y +CONFIG_SPL_NAND_BASE=y # CONFIG_SPL_YMODEM_SUPPORT is not set # CONFIG_CMD_FLASH is not set CONFIG_CMD_NAND=y diff --git a/configs/am335x_hs_evm_uart_defconfig b/configs/am335x_hs_evm_uart_defconfig index f52cc9676e..339a995af3 100644 --- a/configs/am335x_hs_evm_uart_defconfig +++ b/configs/am335x_hs_evm_uart_defconfig @@ -27,6 +27,7 @@ CONFIG_SPL_MTD_SUPPORT=y # CONFIG_SPL_NAND_SUPPORT is not set CONFIG_SPL_NAND_DRIVERS=y CONFIG_SPL_NAND_ECC=y +CONFIG_SPL_NAND_BASE=y # CONFIG_CMD_FLASH is not set CONFIG_CMD_NAND=y # CONFIG_CMD_SETEXPR is not set diff --git a/configs/am335x_igep003x_defconfig b/configs/am335x_igep003x_defconfig index 8bf23a601c..f624bb410b 100644 --- a/configs/am335x_igep003x_defconfig +++ b/configs/am335x_igep003x_defconfig @@ -25,6 +25,7 @@ CONFIG_SPL_I2C_SUPPORT=y CONFIG_SPL_MTD_SUPPORT=y CONFIG_SPL_NAND_DRIVERS=y CONFIG_SPL_NAND_ECC=y +CONFIG_SPL_NAND_BASE=y CONFIG_SPL_UBI=y CONFIG_SPL_UBI_MAX_VOL_LEBS=256 CONFIG_SPL_UBI_MAX_PEB_SIZE=262144 diff --git a/configs/am335x_sl50_defconfig b/configs/am335x_sl50_defconfig index f15b5ccbea..6a9555a32a 100644 --- a/configs/am335x_sl50_defconfig +++ b/configs/am335x_sl50_defconfig @@ -25,6 +25,7 @@ CONFIG_SPL_I2C_SUPPORT=y CONFIG_SPL_MTD_SUPPORT=y CONFIG_SPL_NAND_DRIVERS=y CONFIG_SPL_NAND_ECC=y +CONFIG_SPL_NAND_BASE=y CONFIG_SPL_NET_SUPPORT=y CONFIG_SPL_NET_VCI_STRING="AM335x U-Boot SPL" CONFIG_SPL_OS_BOOT=y diff --git a/configs/am3517_crane_defconfig b/configs/am3517_crane_defconfig index 4155df51bd..44f6c064dd 100644 --- a/configs/am3517_crane_defconfig +++ b/configs/am3517_crane_defconfig @@ -13,6 +13,7 @@ CONFIG_BOOTDELAY=10 CONFIG_SPL_NAND_DRIVERS=y CONFIG_SPL_NAND_ECC=y CONFIG_SPL_NAND_SIMPLE=y +CONFIG_SPL_NAND_BASE=y CONFIG_HUSH_PARSER=y # CONFIG_CMDLINE_EDITING is not set CONFIG_SYS_PROMPT="AM3517_CRANE # " diff --git a/configs/am3517_evm_defconfig b/configs/am3517_evm_defconfig index 7a798f738e..f235978f30 100644 --- a/configs/am3517_evm_defconfig +++ b/configs/am3517_evm_defconfig @@ -25,6 +25,7 @@ CONFIG_SPL_MTD_SUPPORT=y CONFIG_SPL_NAND_DRIVERS=y CONFIG_SPL_NAND_ECC=y CONFIG_SPL_NAND_SIMPLE=y +CONFIG_SPL_NAND_BASE=y CONFIG_SPL_OS_BOOT=y # CONFIG_SPL_POWER_SUPPORT is not set CONFIG_SYS_PROMPT="AM3517_EVM # " diff --git a/configs/am43xx_evm_defconfig b/configs/am43xx_evm_defconfig index 33a3df1368..61637c6e00 100644 --- a/configs/am43xx_evm_defconfig +++ b/configs/am43xx_evm_defconfig @@ -19,6 +19,7 @@ CONFIG_SPL_ETH_SUPPORT=y CONFIG_SPL_MTD_SUPPORT=y CONFIG_SPL_NAND_DRIVERS=y CONFIG_SPL_NAND_ECC=y +CONFIG_SPL_NAND_BASE=y CONFIG_SPL_NET_SUPPORT=y CONFIG_SPL_NET_VCI_STRING="AM43xx U-Boot SPL" CONFIG_SPL_OS_BOOT=y diff --git a/configs/am43xx_evm_rtconly_defconfig b/configs/am43xx_evm_rtconly_defconfig index 1c40d51c72..a82c542bf5 100644 --- a/configs/am43xx_evm_rtconly_defconfig +++ b/configs/am43xx_evm_rtconly_defconfig @@ -18,6 +18,7 @@ CONFIG_VERSION_VARIABLE=y CONFIG_SPL_MTD_SUPPORT=y CONFIG_SPL_NAND_DRIVERS=y CONFIG_SPL_NAND_ECC=y +CONFIG_SPL_NAND_BASE=y CONFIG_SPL_OS_BOOT=y CONFIG_CMD_SPL=y CONFIG_CMD_SPL_NAND_OFS=0x00100000 diff --git a/configs/am43xx_evm_usbhost_boot_defconfig b/configs/am43xx_evm_usbhost_boot_defconfig index 7f05a1ac6f..bcc6324c54 100644 --- a/configs/am43xx_evm_usbhost_boot_defconfig +++ b/configs/am43xx_evm_usbhost_boot_defconfig @@ -17,6 +17,7 @@ CONFIG_VERSION_VARIABLE=y CONFIG_SPL_MTD_SUPPORT=y CONFIG_SPL_NAND_DRIVERS=y CONFIG_SPL_NAND_ECC=y +CONFIG_SPL_NAND_BASE=y CONFIG_SPL_OS_BOOT=y CONFIG_SPL_USB_HOST_SUPPORT=y CONFIG_SPL_USB_STORAGE=y diff --git a/configs/am43xx_hs_evm_defconfig b/configs/am43xx_hs_evm_defconfig index e85e476468..a913a32dee 100644 --- a/configs/am43xx_hs_evm_defconfig +++ b/configs/am43xx_hs_evm_defconfig @@ -28,6 +28,7 @@ CONFIG_SPL_ETH_SUPPORT=y CONFIG_SPL_MTD_SUPPORT=y CONFIG_SPL_NAND_DRIVERS=y CONFIG_SPL_NAND_ECC=y +CONFIG_SPL_NAND_BASE=y CONFIG_SPL_NET_SUPPORT=y CONFIG_SPL_NET_VCI_STRING="AM43xx U-Boot SPL" CONFIG_SPL_USB_HOST_SUPPORT=y diff --git a/configs/axm_defconfig b/configs/axm_defconfig index 837e72969f..0a3ddf90b1 100644 --- a/configs/axm_defconfig +++ b/configs/axm_defconfig @@ -37,6 +37,7 @@ CONFIG_SPL_NAND_SUPPORT=y CONFIG_SPL_DM_SPI_FLASH=y CONFIG_SPL_NAND_DRIVERS=y CONFIG_SPL_NAND_ECC=y +CONFIG_SPL_NAND_BASE=y CONFIG_HUSH_PARSER=y CONFIG_SYS_PROMPT="U-Boot> " # CONFIG_CMD_BDI is not set diff --git a/configs/brppt1_nand_defconfig b/configs/brppt1_nand_defconfig index fff41036b5..afe20315ae 100644 --- a/configs/brppt1_nand_defconfig +++ b/configs/brppt1_nand_defconfig @@ -34,6 +34,7 @@ CONFIG_SPL_SEPARATE_BSS=y CONFIG_SPL_I2C_SUPPORT=y CONFIG_SPL_NAND_DRIVERS=y CONFIG_SPL_NAND_ECC=y +CONFIG_SPL_NAND_BASE=y CONFIG_SPL_POWER_SUPPORT=y CONFIG_SPL_WATCHDOG_SUPPORT=y CONFIG_SPL_YMODEM_SUPPORT=y diff --git a/configs/chiliboard_defconfig b/configs/chiliboard_defconfig index 1b08e75090..9c3fe8e134 100644 --- a/configs/chiliboard_defconfig +++ b/configs/chiliboard_defconfig @@ -24,6 +24,7 @@ CONFIG_ARCH_MISC_INIT=y CONFIG_SPL_I2C_SUPPORT=y CONFIG_SPL_NAND_DRIVERS=y CONFIG_SPL_NAND_ECC=y +CONFIG_SPL_NAND_BASE=y CONFIG_SPL_POWER_SUPPORT=y CONFIG_SPL_WATCHDOG_SUPPORT=y CONFIG_CMD_ASKENV=y diff --git a/configs/cm_t335_defconfig b/configs/cm_t335_defconfig index 85d2114e43..92538a4a9b 100644 --- a/configs/cm_t335_defconfig +++ b/configs/cm_t335_defconfig @@ -22,6 +22,7 @@ CONFIG_SPL_I2C_SUPPORT=y CONFIG_SPL_MTD_SUPPORT=y CONFIG_SPL_NAND_DRIVERS=y CONFIG_SPL_NAND_ECC=y +CONFIG_SPL_NAND_BASE=y CONFIG_SPL_POWER_SUPPORT=y CONFIG_SPL_WATCHDOG_SUPPORT=y # CONFIG_SPL_AM33XX_ENABLE_RTC32K_OSC is not set diff --git a/configs/cm_t43_defconfig b/configs/cm_t43_defconfig index 1679b741ad..0d9afce7a9 100644 --- a/configs/cm_t43_defconfig +++ b/configs/cm_t43_defconfig @@ -35,6 +35,7 @@ CONFIG_SPL_MTD_SUPPORT=y CONFIG_SPL_DM_SPI_FLASH=y CONFIG_SPL_NAND_DRIVERS=y CONFIG_SPL_NAND_ECC=y +CONFIG_SPL_NAND_BASE=y CONFIG_SPL_POWER_SUPPORT=y CONFIG_SPL_SPI_LOAD=y CONFIG_SYS_PROMPT="CM-T43 # " diff --git a/configs/corvus_defconfig b/configs/corvus_defconfig index d97cb111f7..a8ed2b76b0 100644 --- a/configs/corvus_defconfig +++ b/configs/corvus_defconfig @@ -26,6 +26,7 @@ CONFIG_SPL_SYS_MALLOC_SIMPLE=y CONFIG_SPL_NAND_SUPPORT=y CONFIG_SPL_NAND_DRIVERS=y CONFIG_SPL_NAND_ECC=y +CONFIG_SPL_NAND_BASE=y CONFIG_HUSH_PARSER=y CONFIG_SYS_PROMPT="U-Boot> " # CONFIG_CMD_BDI is not set diff --git a/configs/da850evm_nand_defconfig b/configs/da850evm_nand_defconfig index d6c14b0a8f..e86f67d564 100644 --- a/configs/da850evm_nand_defconfig +++ b/configs/da850evm_nand_defconfig @@ -30,6 +30,7 @@ CONFIG_SPL_NAND_SUPPORT=y CONFIG_SPL_NAND_DRIVERS=y CONFIG_SPL_NAND_ECC=y CONFIG_SPL_NAND_SIMPLE=y +CONFIG_SPL_NAND_BASE=y CONFIG_HUSH_PARSER=y CONFIG_SYS_PROMPT="U-Boot > " CONFIG_CRC32_VERIFY=y diff --git a/configs/devkit8000_defconfig b/configs/devkit8000_defconfig index 4eae268fed..593e9ca8eb 100644 --- a/configs/devkit8000_defconfig +++ b/configs/devkit8000_defconfig @@ -12,6 +12,7 @@ CONFIG_VERSION_VARIABLE=y CONFIG_SPL_NAND_DRIVERS=y CONFIG_SPL_NAND_ECC=y CONFIG_SPL_NAND_SIMPLE=y +CONFIG_SPL_NAND_BASE=y CONFIG_SPL_OS_BOOT=y # CONFIG_CMD_IMI is not set CONFIG_CMD_SPL=y diff --git a/configs/dra7xx_evm_defconfig b/configs/dra7xx_evm_defconfig index 568b8a7632..7a8736b248 100644 --- a/configs/dra7xx_evm_defconfig +++ b/configs/dra7xx_evm_defconfig @@ -32,6 +32,7 @@ CONFIG_SPL_DMA=y CONFIG_SPL_DM_SPI_FLASH=y CONFIG_SPL_NAND_DRIVERS=y CONFIG_SPL_NAND_ECC=y +CONFIG_SPL_NAND_BASE=y CONFIG_SPL_OS_BOOT=y CONFIG_SPL_RAM_SUPPORT=y CONFIG_SPL_SPI_LOAD=y diff --git a/configs/dra7xx_hs_evm_defconfig b/configs/dra7xx_hs_evm_defconfig index 60cb5b934c..2121adf11a 100644 --- a/configs/dra7xx_hs_evm_defconfig +++ b/configs/dra7xx_hs_evm_defconfig @@ -38,6 +38,7 @@ CONFIG_SPL_DMA=y CONFIG_SPL_DM_SPI_FLASH=y CONFIG_SPL_NAND_DRIVERS=y CONFIG_SPL_NAND_ECC=y +CONFIG_SPL_NAND_BASE=y CONFIG_SPL_RAM_SUPPORT=y CONFIG_SPL_SPI_LOAD=y CONFIG_SPL_USB_GADGET=y diff --git a/configs/draco_defconfig b/configs/draco_defconfig index 57db362171..bbc13d9b2e 100644 --- a/configs/draco_defconfig +++ b/configs/draco_defconfig @@ -32,6 +32,7 @@ CONFIG_SPL_I2C_SUPPORT=y CONFIG_SPL_DM_SPI_FLASH=y CONFIG_SPL_NAND_DRIVERS=y CONFIG_SPL_NAND_ECC=y +CONFIG_SPL_NAND_BASE=y CONFIG_SPL_SPI_LOAD=y CONFIG_SPL_WATCHDOG_SUPPORT=y CONFIG_SPL_YMODEM_SUPPORT=y diff --git a/configs/etamin_defconfig b/configs/etamin_defconfig index 249b9ba74a..213379299d 100644 --- a/configs/etamin_defconfig +++ b/configs/etamin_defconfig @@ -33,6 +33,7 @@ CONFIG_SPL_I2C_SUPPORT=y CONFIG_SPL_DM_SPI_FLASH=y CONFIG_SPL_NAND_DRIVERS=y CONFIG_SPL_NAND_ECC=y +CONFIG_SPL_NAND_BASE=y CONFIG_SPL_SPI_LOAD=y CONFIG_SPL_WATCHDOG_SUPPORT=y CONFIG_SPL_YMODEM_SUPPORT=y diff --git a/configs/gardena-smart-gateway-at91sam_defconfig b/configs/gardena-smart-gateway-at91sam_defconfig index 6344e5fb52..425feb635d 100644 --- a/configs/gardena-smart-gateway-at91sam_defconfig +++ b/configs/gardena-smart-gateway-at91sam_defconfig @@ -30,6 +30,7 @@ CONFIG_SPL_SYS_MALLOC_SIMPLE=y # CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_USE_SECTOR is not set CONFIG_SPL_NAND_SUPPORT=y CONFIG_SPL_NAND_DRIVERS=y +CONFIG_SPL_NAND_BASE=y CONFIG_HUSH_PARSER=y CONFIG_CMD_BOOTZ=y CONFIG_CMD_DM=y diff --git a/configs/igep00x0_defconfig b/configs/igep00x0_defconfig index 1bc36cab80..3a3f0d0a5d 100644 --- a/configs/igep00x0_defconfig +++ b/configs/igep00x0_defconfig @@ -21,6 +21,7 @@ CONFIG_SPL_MTD_SUPPORT=y CONFIG_SPL_NAND_DRIVERS=y CONFIG_SPL_NAND_ECC=y CONFIG_SPL_NAND_SIMPLE=y +CONFIG_SPL_NAND_BASE=y CONFIG_SPL_UBI=y CONFIG_SPL_UBI_MAX_VOL_LEBS=256 CONFIG_SPL_UBI_MAX_PEB_SIZE=262144 diff --git a/configs/k2e_evm_defconfig b/configs/k2e_evm_defconfig index 070b58bd6e..54a26e853b 100644 --- a/configs/k2e_evm_defconfig +++ b/configs/k2e_evm_defconfig @@ -28,6 +28,7 @@ CONFIG_SPL_I2C_SUPPORT=y CONFIG_SPL_DM_SPI_FLASH=y CONFIG_SPL_NAND_DRIVERS=y CONFIG_SPL_NAND_ECC=y +CONFIG_SPL_NAND_BASE=y CONFIG_SPL_POWER_SUPPORT=y CONFIG_SPL_SPI_LOAD=y CONFIG_CMD_MX_CYCLIC=y diff --git a/configs/k2g_evm_defconfig b/configs/k2g_evm_defconfig index bd8ff01d0e..116b626661 100644 --- a/configs/k2g_evm_defconfig +++ b/configs/k2g_evm_defconfig @@ -26,6 +26,7 @@ CONFIG_BOARD_EARLY_INIT_F=y CONFIG_SPL_I2C_SUPPORT=y CONFIG_SPL_NAND_DRIVERS=y CONFIG_SPL_NAND_ECC=y +CONFIG_SPL_NAND_BASE=y CONFIG_SPL_POWER_SUPPORT=y CONFIG_SPL_SPI_LOAD=y CONFIG_CMD_MX_CYCLIC=y diff --git a/configs/k2hk_evm_defconfig b/configs/k2hk_evm_defconfig index bdfccbcad7..c4b8e36d2f 100644 --- a/configs/k2hk_evm_defconfig +++ b/configs/k2hk_evm_defconfig @@ -28,6 +28,7 @@ CONFIG_SPL_I2C_SUPPORT=y CONFIG_SPL_DM_SPI_FLASH=y CONFIG_SPL_NAND_DRIVERS=y CONFIG_SPL_NAND_ECC=y +CONFIG_SPL_NAND_BASE=y CONFIG_SPL_POWER_SUPPORT=y CONFIG_SPL_SPI_LOAD=y CONFIG_CMD_MX_CYCLIC=y diff --git a/configs/k2l_evm_defconfig b/configs/k2l_evm_defconfig index 22c31359f8..84268cd0be 100644 --- a/configs/k2l_evm_defconfig +++ b/configs/k2l_evm_defconfig @@ -28,6 +28,7 @@ CONFIG_SPL_I2C_SUPPORT=y CONFIG_SPL_DM_SPI_FLASH=y CONFIG_SPL_NAND_DRIVERS=y CONFIG_SPL_NAND_ECC=y +CONFIG_SPL_NAND_BASE=y CONFIG_SPL_POWER_SUPPORT=y CONFIG_SPL_SPI_LOAD=y CONFIG_CMD_MX_CYCLIC=y diff --git a/configs/omap35_logic_defconfig b/configs/omap35_logic_defconfig index 30d11f0f8b..d9d799b575 100644 --- a/configs/omap35_logic_defconfig +++ b/configs/omap35_logic_defconfig @@ -29,6 +29,7 @@ CONFIG_SPL_MTD_SUPPORT=y CONFIG_SPL_NAND_DRIVERS=y CONFIG_SPL_NAND_ECC=y CONFIG_SPL_NAND_SIMPLE=y +CONFIG_SPL_NAND_BASE=y CONFIG_SPL_OS_BOOT=y CONFIG_SYS_PROMPT="OMAP Logic # " # CONFIG_CMD_IMI is not set diff --git a/configs/omap35_logic_somlv_defconfig b/configs/omap35_logic_somlv_defconfig index d4ad44fb7b..d3505469af 100644 --- a/configs/omap35_logic_somlv_defconfig +++ b/configs/omap35_logic_somlv_defconfig @@ -28,6 +28,7 @@ CONFIG_SPL_MTD_SUPPORT=y CONFIG_SPL_NAND_DRIVERS=y CONFIG_SPL_NAND_ECC=y CONFIG_SPL_NAND_SIMPLE=y +CONFIG_SPL_NAND_BASE=y CONFIG_SPL_OS_BOOT=y # CONFIG_SPL_POWER_SUPPORT is not set CONFIG_SYS_PROMPT="OMAP Logic # " diff --git a/configs/omap3_beagle_defconfig b/configs/omap3_beagle_defconfig index 1f40d81613..020e58d3ed 100644 --- a/configs/omap3_beagle_defconfig +++ b/configs/omap3_beagle_defconfig @@ -23,6 +23,7 @@ CONFIG_SPL_MTD_SUPPORT=y CONFIG_SPL_NAND_DRIVERS=y CONFIG_SPL_NAND_ECC=y CONFIG_SPL_NAND_SIMPLE=y +CONFIG_SPL_NAND_BASE=y CONFIG_SYS_PROMPT="BeagleBoard # " CONFIG_CMD_SPL=y CONFIG_CMD_SPL_NAND_OFS=0x280000 diff --git a/configs/omap3_evm_defconfig b/configs/omap3_evm_defconfig index 3c0d5fe517..cf65c12447 100644 --- a/configs/omap3_evm_defconfig +++ b/configs/omap3_evm_defconfig @@ -21,6 +21,7 @@ CONFIG_SPL_MTD_SUPPORT=y CONFIG_SPL_NAND_DRIVERS=y CONFIG_SPL_NAND_ECC=y CONFIG_SPL_NAND_SIMPLE=y +CONFIG_SPL_NAND_BASE=y CONFIG_SYS_PROMPT="OMAP3_EVM # " CONFIG_CMD_SPL=y CONFIG_CMD_SPL_NAND_OFS=0x280000 diff --git a/configs/omap3_ha_defconfig b/configs/omap3_ha_defconfig index ce5a44fddc..66967871a8 100644 --- a/configs/omap3_ha_defconfig +++ b/configs/omap3_ha_defconfig @@ -12,6 +12,7 @@ CONFIG_BOOTDELAY=3 CONFIG_SPL_NAND_DRIVERS=y CONFIG_SPL_NAND_ECC=y CONFIG_SPL_NAND_SIMPLE=y +CONFIG_SPL_NAND_BASE=y CONFIG_HUSH_PARSER=y # CONFIG_CMD_IMI is not set # CONFIG_CMD_FLASH is not set diff --git a/configs/omap3_logic_defconfig b/configs/omap3_logic_defconfig index 4ca486a7f3..755d86d6a0 100644 --- a/configs/omap3_logic_defconfig +++ b/configs/omap3_logic_defconfig @@ -28,6 +28,7 @@ CONFIG_SPL_MTD_SUPPORT=y CONFIG_SPL_NAND_DRIVERS=y CONFIG_SPL_NAND_ECC=y CONFIG_SPL_NAND_SIMPLE=y +CONFIG_SPL_NAND_BASE=y CONFIG_SPL_OS_BOOT=y CONFIG_SYS_PROMPT="OMAP Logic # " # CONFIG_CMD_IMI is not set diff --git a/configs/omap3_logic_somlv_defconfig b/configs/omap3_logic_somlv_defconfig index 96edbe2502..af2cc3477f 100644 --- a/configs/omap3_logic_somlv_defconfig +++ b/configs/omap3_logic_somlv_defconfig @@ -29,6 +29,7 @@ CONFIG_SPL_MTD_SUPPORT=y CONFIG_SPL_NAND_DRIVERS=y CONFIG_SPL_NAND_ECC=y CONFIG_SPL_NAND_SIMPLE=y +CONFIG_SPL_NAND_BASE=y CONFIG_SPL_OS_BOOT=y # CONFIG_SPL_POWER_SUPPORT is not set CONFIG_SYS_PROMPT="OMAP Logic # " diff --git a/configs/omapl138_lcdk_defconfig b/configs/omapl138_lcdk_defconfig index 1b4e30beb7..45194aa5d5 100644 --- a/configs/omapl138_lcdk_defconfig +++ b/configs/omapl138_lcdk_defconfig @@ -31,6 +31,7 @@ CONFIG_SPL_NAND_SUPPORT=y CONFIG_SPL_NAND_DRIVERS=y CONFIG_SPL_NAND_ECC=y CONFIG_SPL_NAND_SIMPLE=y +CONFIG_SPL_NAND_BASE=y CONFIG_HUSH_PARSER=y CONFIG_CRC32_VERIFY=y # CONFIG_CMD_EEPROM is not set diff --git a/configs/phycore-am335x-r2-wega_defconfig b/configs/phycore-am335x-r2-wega_defconfig index dae5a088c0..692568b313 100644 --- a/configs/phycore-am335x-r2-wega_defconfig +++ b/configs/phycore-am335x-r2-wega_defconfig @@ -26,6 +26,7 @@ CONFIG_SPL_I2C_SUPPORT=y CONFIG_SPL_MTD_SUPPORT=y CONFIG_SPL_NAND_DRIVERS=y CONFIG_SPL_NAND_ECC=y +CONFIG_SPL_NAND_BASE=y CONFIG_SPL_POWER_SUPPORT=y CONFIG_HUSH_PARSER=y CONFIG_CMD_BOOTZ=y diff --git a/configs/pxm2_defconfig b/configs/pxm2_defconfig index 690eb6bed6..b2e89bb903 100644 --- a/configs/pxm2_defconfig +++ b/configs/pxm2_defconfig @@ -33,6 +33,7 @@ CONFIG_SPL_I2C_SUPPORT=y CONFIG_SPL_DM_SPI_FLASH=y CONFIG_SPL_NAND_DRIVERS=y CONFIG_SPL_NAND_ECC=y +CONFIG_SPL_NAND_BASE=y CONFIG_SPL_SPI_LOAD=y CONFIG_SPL_WATCHDOG_SUPPORT=y CONFIG_SPL_YMODEM_SUPPORT=y diff --git a/configs/rastaban_defconfig b/configs/rastaban_defconfig index 4ceefca065..ae3fb0465e 100644 --- a/configs/rastaban_defconfig +++ b/configs/rastaban_defconfig @@ -32,6 +32,7 @@ CONFIG_SPL_I2C_SUPPORT=y CONFIG_SPL_DM_SPI_FLASH=y CONFIG_SPL_NAND_DRIVERS=y CONFIG_SPL_NAND_ECC=y +CONFIG_SPL_NAND_BASE=y CONFIG_SPL_SPI_LOAD=y CONFIG_SPL_WATCHDOG_SUPPORT=y CONFIG_SPL_YMODEM_SUPPORT=y diff --git a/configs/rut_defconfig b/configs/rut_defconfig index ad78db3e9e..dd11fca506 100644 --- a/configs/rut_defconfig +++ b/configs/rut_defconfig @@ -34,6 +34,7 @@ CONFIG_SPL_I2C_SUPPORT=y CONFIG_SPL_DM_SPI_FLASH=y CONFIG_SPL_NAND_DRIVERS=y CONFIG_SPL_NAND_ECC=y +CONFIG_SPL_NAND_BASE=y CONFIG_SPL_SPI_LOAD=y CONFIG_SPL_WATCHDOG_SUPPORT=y CONFIG_SPL_YMODEM_SUPPORT=y diff --git a/configs/sama5d3_xplained_nandflash_defconfig b/configs/sama5d3_xplained_nandflash_defconfig index d8c07f7215..5e67e5c08d 100644 --- a/configs/sama5d3_xplained_nandflash_defconfig +++ b/configs/sama5d3_xplained_nandflash_defconfig @@ -28,6 +28,7 @@ CONFIG_BOOTARGS="console=ttyS0,115200 earlyprintk mtdparts=atmel_nand:256k(boots # CONFIG_DISPLAY_BOARDINFO is not set CONFIG_SPL_NAND_SUPPORT=y CONFIG_SPL_NAND_DRIVERS=y +CONFIG_SPL_NAND_BASE=y CONFIG_HUSH_PARSER=y CONFIG_CMD_BOOTZ=y # CONFIG_CMD_FLASH is not set diff --git a/configs/sama5d3xek_nandflash_defconfig b/configs/sama5d3xek_nandflash_defconfig index eba49c668f..2106a909c5 100644 --- a/configs/sama5d3xek_nandflash_defconfig +++ b/configs/sama5d3xek_nandflash_defconfig @@ -30,6 +30,7 @@ CONFIG_SYS_CONSOLE_IS_IN_ENV=y # CONFIG_DISPLAY_BOARDINFO is not set CONFIG_SPL_NAND_SUPPORT=y CONFIG_SPL_NAND_DRIVERS=y +CONFIG_SPL_NAND_BASE=y CONFIG_HUSH_PARSER=y CONFIG_CMD_BOOTZ=y # CONFIG_CMD_IMI is not set diff --git a/configs/sama5d4_xplained_nandflash_defconfig b/configs/sama5d4_xplained_nandflash_defconfig index c28492dc60..addf44592c 100644 --- a/configs/sama5d4_xplained_nandflash_defconfig +++ b/configs/sama5d4_xplained_nandflash_defconfig @@ -29,6 +29,7 @@ CONFIG_MISC_INIT_R=y # CONFIG_DISPLAY_BOARDINFO is not set CONFIG_SPL_NAND_SUPPORT=y CONFIG_SPL_NAND_DRIVERS=y +CONFIG_SPL_NAND_BASE=y CONFIG_HUSH_PARSER=y CONFIG_CMD_BOOTZ=y # CONFIG_CMD_FLASH is not set diff --git a/configs/sama5d4ek_nandflash_defconfig b/configs/sama5d4ek_nandflash_defconfig index 6faff4d666..2c12fb9db0 100644 --- a/configs/sama5d4ek_nandflash_defconfig +++ b/configs/sama5d4ek_nandflash_defconfig @@ -30,6 +30,7 @@ CONFIG_SYS_CONSOLE_IS_IN_ENV=y # CONFIG_DISPLAY_BOARDINFO is not set CONFIG_SPL_NAND_SUPPORT=y CONFIG_SPL_NAND_DRIVERS=y +CONFIG_SPL_NAND_BASE=y CONFIG_HUSH_PARSER=y CONFIG_CMD_BOOTZ=y # CONFIG_CMD_IMI is not set diff --git a/configs/smartweb_defconfig b/configs/smartweb_defconfig index 7bdd8f091d..96a8a723b3 100644 --- a/configs/smartweb_defconfig +++ b/configs/smartweb_defconfig @@ -25,6 +25,7 @@ CONFIG_BOARD_EARLY_INIT_F=y CONFIG_SPL_NAND_SUPPORT=y CONFIG_SPL_NAND_DRIVERS=y CONFIG_SPL_NAND_ECC=y +CONFIG_SPL_NAND_BASE=y CONFIG_HUSH_PARSER=y CONFIG_SYS_PROMPT="U-Boot# " CONFIG_AUTOBOOT_KEYED=y diff --git a/configs/tao3530_defconfig b/configs/tao3530_defconfig index 4f57b0f280..d87b355069 100644 --- a/configs/tao3530_defconfig +++ b/configs/tao3530_defconfig @@ -11,6 +11,7 @@ CONFIG_BOOTDELAY=3 CONFIG_SPL_NAND_DRIVERS=y CONFIG_SPL_NAND_ECC=y CONFIG_SPL_NAND_SIMPLE=y +CONFIG_SPL_NAND_BASE=y CONFIG_HUSH_PARSER=y CONFIG_SYS_PROMPT="TAO-3530 # " # CONFIG_CMD_IMI is not set diff --git a/configs/taurus_defconfig b/configs/taurus_defconfig index fa0fb41cb3..f5fd14cb90 100644 --- a/configs/taurus_defconfig +++ b/configs/taurus_defconfig @@ -41,6 +41,7 @@ CONFIG_SPL_NAND_SUPPORT=y CONFIG_SPL_DM_SPI_FLASH=y CONFIG_SPL_NAND_DRIVERS=y CONFIG_SPL_NAND_ECC=y +CONFIG_SPL_NAND_BASE=y CONFIG_HUSH_PARSER=y CONFIG_SYS_PROMPT="U-Boot> " CONFIG_SYS_XTRACE="n" diff --git a/configs/thuban_defconfig b/configs/thuban_defconfig index 8402408355..fa02206651 100644 --- a/configs/thuban_defconfig +++ b/configs/thuban_defconfig @@ -32,6 +32,7 @@ CONFIG_SPL_I2C_SUPPORT=y CONFIG_SPL_DM_SPI_FLASH=y CONFIG_SPL_NAND_DRIVERS=y CONFIG_SPL_NAND_ECC=y +CONFIG_SPL_NAND_BASE=y CONFIG_SPL_SPI_LOAD=y CONFIG_SPL_WATCHDOG_SUPPORT=y CONFIG_SPL_YMODEM_SUPPORT=y diff --git a/configs/ti816x_evm_defconfig b/configs/ti816x_evm_defconfig index e436175fb3..26172a7bdb 100644 --- a/configs/ti816x_evm_defconfig +++ b/configs/ti816x_evm_defconfig @@ -30,6 +30,7 @@ CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR=0x300 CONFIG_SPL_NAND_SUPPORT=y CONFIG_SPL_NAND_DRIVERS=y CONFIG_SPL_NAND_ECC=y +CONFIG_SPL_NAND_BASE=y CONFIG_CMD_ASKENV=y # CONFIG_CMD_FLASH is not set CONFIG_CMD_GPIO=y diff --git a/configs/tricorder_defconfig b/configs/tricorder_defconfig index 34f8dc9ede..49613801cc 100644 --- a/configs/tricorder_defconfig +++ b/configs/tricorder_defconfig @@ -13,6 +13,7 @@ CONFIG_SILENT_CONSOLE=y CONFIG_SPL_NAND_DRIVERS=y CONFIG_SPL_NAND_ECC=y CONFIG_SPL_NAND_SIMPLE=y +CONFIG_SPL_NAND_BASE=y CONFIG_HUSH_PARSER=y CONFIG_SYS_PROMPT="OMAP3 Tricorder # " # CONFIG_CMD_IMI is not set diff --git a/configs/tricorder_flash_defconfig b/configs/tricorder_flash_defconfig index 022e951b53..43970093d1 100644 --- a/configs/tricorder_flash_defconfig +++ b/configs/tricorder_flash_defconfig @@ -12,6 +12,7 @@ CONFIG_SILENT_CONSOLE=y CONFIG_SPL_NAND_DRIVERS=y CONFIG_SPL_NAND_ECC=y CONFIG_SPL_NAND_SIMPLE=y +CONFIG_SPL_NAND_BASE=y CONFIG_HUSH_PARSER=y # CONFIG_CMD_IMI is not set CONFIG_CMD_EEPROM=y diff --git a/configs/wb45n_defconfig b/configs/wb45n_defconfig index 398b5c36b9..01adf93d05 100644 --- a/configs/wb45n_defconfig +++ b/configs/wb45n_defconfig @@ -20,6 +20,7 @@ CONFIG_BOOTARGS="console=ttyS0,115200 earlyprintk rw noinitrd mem=64M rootfstype CONFIG_BOARD_EARLY_INIT_F=y CONFIG_SPL_NAND_SUPPORT=y CONFIG_SPL_NAND_DRIVERS=y +CONFIG_SPL_NAND_BASE=y CONFIG_HUSH_PARSER=y CONFIG_CMD_BOOTZ=y CONFIG_CMD_MEMTEST=y diff --git a/configs/wb50n_defconfig b/configs/wb50n_defconfig index b89bf11083..4bee60fe75 100644 --- a/configs/wb50n_defconfig +++ b/configs/wb50n_defconfig @@ -19,6 +19,7 @@ CONFIG_USE_BOOTARGS=y CONFIG_BOOTARGS="rw rootfstype=ubifs ubi.mtd=6 root=ubi0:rootfs" CONFIG_SPL_NAND_SUPPORT=y CONFIG_SPL_NAND_DRIVERS=y +CONFIG_SPL_NAND_BASE=y CONFIG_HUSH_PARSER=y CONFIG_CMD_BOOTZ=y CONFIG_CMD_MEMTEST=y diff --git a/configs/work_92105_defconfig b/configs/work_92105_defconfig index e884cf7cd3..10694f4028 100644 --- a/configs/work_92105_defconfig +++ b/configs/work_92105_defconfig @@ -27,6 +27,7 @@ CONFIG_SPL_BOARD_INIT=y CONFIG_SPL_SYS_MALLOC_SIMPLE=y CONFIG_SPL_NAND_SUPPORT=y CONFIG_SPL_NAND_DRIVERS=y +CONFIG_SPL_NAND_BASE=y CONFIG_HUSH_PARSER=y CONFIG_CMD_EEPROM=y # CONFIG_CMD_FLASH is not set diff --git a/include/configs/am3517_crane.h b/include/configs/am3517_crane.h index f4cae8a2c5..e331cce908 100644 --- a/include/configs/am3517_crane.h +++ b/include/configs/am3517_crane.h @@ -210,8 +210,6 @@ #define CONFIG_SYS_MMCSD_FS_BOOT_PARTITION 1 #define CONFIG_SPL_FS_LOAD_PAYLOAD_NAME "u-boot.img" -#define CONFIG_SPL_NAND_BASE - /* NAND boot config */ #define CONFIG_SYS_NAND_5_ADDR_CYCLE #define CONFIG_SYS_NAND_PAGE_COUNT 64 diff --git a/include/configs/am3517_evm.h b/include/configs/am3517_evm.h index 89b95d635e..fc7d399e2e 100644 --- a/include/configs/am3517_evm.h +++ b/include/configs/am3517_evm.h @@ -175,6 +175,4 @@ #define CONFIG_SYS_MMCSD_FS_BOOT_PARTITION 1 #define CONFIG_SPL_FS_LOAD_PAYLOAD_NAME "u-boot.img" -#define CONFIG_SPL_NAND_BASE - #endif /* __CONFIG_H */ diff --git a/include/configs/at91sam9m10g45ek.h b/include/configs/at91sam9m10g45ek.h index 3ecb89b731..e20cb5e332 100644 --- a/include/configs/at91sam9m10g45ek.h +++ b/include/configs/at91sam9m10g45ek.h @@ -105,7 +105,6 @@ #define CONFIG_SPL_FS_LOAD_PAYLOAD_NAME "u-boot.img" #elif CONFIG_NAND_BOOT -#define CONFIG_SPL_NAND_BASE #define CONFIG_SPL_NAND_SOFTECC #define CONFIG_SYS_NAND_U_BOOT_OFFS 0x40000 #define CONFIG_SYS_NAND_U_BOOT_SIZE 0x80000 diff --git a/include/configs/at91sam9n12ek.h b/include/configs/at91sam9n12ek.h index ae0ae9b08d..7fb8aa3246 100644 --- a/include/configs/at91sam9n12ek.h +++ b/include/configs/at91sam9n12ek.h @@ -135,8 +135,6 @@ #ifdef CONFIG_SD_BOOT #define CONFIG_SYS_MMCSD_FS_BOOT_PARTITION 1 #define CONFIG_SPL_FS_LOAD_PAYLOAD_NAME "u-boot.img" -#elif CONFIG_NAND_BOOT -#define CONFIG_SPL_NAND_BASE #endif #define CONFIG_SYS_NAND_U_BOOT_OFFS 0x40000 #define CONFIG_SYS_NAND_5_ADDR_CYCLE diff --git a/include/configs/at91sam9x5ek.h b/include/configs/at91sam9x5ek.h index f1ab1e6186..1889450f3f 100644 --- a/include/configs/at91sam9x5ek.h +++ b/include/configs/at91sam9x5ek.h @@ -109,8 +109,6 @@ #ifdef CONFIG_SD_BOOT #define CONFIG_SYS_MMCSD_FS_BOOT_PARTITION 1 #define CONFIG_SPL_FS_LOAD_PAYLOAD_NAME "u-boot.img" -#elif CONFIG_NAND_BOOT -#define CONFIG_SPL_NAND_BASE #endif #define CONFIG_SYS_NAND_U_BOOT_OFFS 0x40000 #define CONFIG_SYS_NAND_5_ADDR_CYCLE diff --git a/include/configs/brppt1.h b/include/configs/brppt1.h index d0054bc968..729d4d9799 100644 --- a/include/configs/brppt1.h +++ b/include/configs/brppt1.h @@ -53,7 +53,6 @@ #endif /* CONFIG_SPL_OS_BOOT */ #ifdef CONFIG_MTD_RAW_NAND -#define CONFIG_SPL_NAND_BASE #define CONFIG_SYS_NAND_U_BOOT_START CONFIG_SYS_TEXT_BASE #define CONFIG_SYS_NAND_U_BOOT_OFFS 0x80000 #endif /* CONFIG_MTD_RAW_NAND */ diff --git a/include/configs/corvus.h b/include/configs/corvus.h index def7fe571c..55f77e4400 100644 --- a/include/configs/corvus.h +++ b/include/configs/corvus.h @@ -105,7 +105,6 @@ #define CONFIG_SPL_BSS_START_ADDR CONFIG_SPL_MAX_SIZE #define CONFIG_SPL_BSS_MAX_SIZE (SZ_2K) -#define CONFIG_SPL_NAND_BASE #define CONFIG_SPL_NAND_RAW_ONLY #define CONFIG_SPL_NAND_SOFTECC #define CONFIG_SYS_NAND_U_BOOT_OFFS 0x20000 diff --git a/include/configs/da850evm.h b/include/configs/da850evm.h index d428b02704..506caffeee 100644 --- a/include/configs/da850evm.h +++ b/include/configs/da850evm.h @@ -144,7 +144,6 @@ #define CONFIG_SYS_NAND_ECCSIZE 512 #define CONFIG_SYS_NAND_ECCBYTES 10 #define CONFIG_SYS_NAND_OOBSIZE 64 -#define CONFIG_SPL_NAND_BASE #define CONFIG_SPL_NAND_LOAD #ifndef CONFIG_SPL_BUILD diff --git a/include/configs/gardena-smart-gateway-at91sam.h b/include/configs/gardena-smart-gateway-at91sam.h index d0149f8609..007cbb043a 100644 --- a/include/configs/gardena-smart-gateway-at91sam.h +++ b/include/configs/gardena-smart-gateway-at91sam.h @@ -63,7 +63,6 @@ #define CONFIG_SYS_MCKR 0x1301 #define CONFIG_SYS_MCKR_CSS 0x1302 -#define CONFIG_SPL_NAND_BASE #define CONFIG_SPL_NAND_RAW_ONLY #define CONFIG_SYS_NAND_U_BOOT_OFFS 0x40000 #define CONFIG_SYS_NAND_U_BOOT_SIZE 0xa0000 diff --git a/include/configs/omapl138_lcdk.h b/include/configs/omapl138_lcdk.h index a62033e86c..4404fef776 100644 --- a/include/configs/omapl138_lcdk.h +++ b/include/configs/omapl138_lcdk.h @@ -145,7 +145,6 @@ #define CONFIG_SYS_NAND_ECCSIZE 512 #define CONFIG_SYS_NAND_ECCBYTES 10 #define CONFIG_SYS_NAND_OOBSIZE 64 -#define CONFIG_SPL_NAND_BASE #define CONFIG_SPL_NAND_LOAD #endif diff --git a/include/configs/pm9g45.h b/include/configs/pm9g45.h index 6e0376619f..47274a5150 100644 --- a/include/configs/pm9g45.h +++ b/include/configs/pm9g45.h @@ -96,7 +96,6 @@ #define CONFIG_SPL_FS_LOAD_PAYLOAD_NAME "u-boot.img" #elif CONFIG_NAND_BOOT -#define CONFIG_SPL_NAND_BASE #define CONFIG_SPL_NAND_SOFTECC #define CONFIG_SYS_NAND_U_BOOT_OFFS 0x40000 #define CONFIG_SYS_NAND_U_BOOT_SIZE 0x80000 diff --git a/include/configs/sama5d3_xplained.h b/include/configs/sama5d3_xplained.h index 7f774461b5..65156c947f 100644 --- a/include/configs/sama5d3_xplained.h +++ b/include/configs/sama5d3_xplained.h @@ -71,9 +71,6 @@ #ifdef CONFIG_SD_BOOT #define CONFIG_SYS_MMCSD_FS_BOOT_PARTITION 1 #define CONFIG_SPL_FS_LOAD_PAYLOAD_NAME "u-boot.img" - -#elif CONFIG_NAND_BOOT -#define CONFIG_SPL_NAND_BASE #endif #define CONFIG_SYS_NAND_U_BOOT_OFFS 0x40000 #define CONFIG_SYS_NAND_5_ADDR_CYCLE diff --git a/include/configs/sama5d3xek.h b/include/configs/sama5d3xek.h index 8d511b1f08..4185826e37 100644 --- a/include/configs/sama5d3xek.h +++ b/include/configs/sama5d3xek.h @@ -83,8 +83,6 @@ #ifdef CONFIG_SD_BOOT #define CONFIG_SYS_MMCSD_FS_BOOT_PARTITION 1 #define CONFIG_SPL_FS_LOAD_PAYLOAD_NAME "u-boot.img" -#elif CONFIG_NAND_BOOT -#define CONFIG_SPL_NAND_BASE #endif #define CONFIG_SYS_NAND_U_BOOT_OFFS 0x40000 #define CONFIG_SYS_NAND_5_ADDR_CYCLE diff --git a/include/configs/sama5d4_xplained.h b/include/configs/sama5d4_xplained.h index 2171a5f6a6..d00be5a445 100644 --- a/include/configs/sama5d4_xplained.h +++ b/include/configs/sama5d4_xplained.h @@ -47,8 +47,6 @@ #ifdef CONFIG_SD_BOOT #define CONFIG_SYS_MMCSD_FS_BOOT_PARTITION 1 #define CONFIG_SPL_FS_LOAD_PAYLOAD_NAME "u-boot.img" -#elif CONFIG_NAND_BOOT -#define CONFIG_SPL_NAND_BASE #endif #define CONFIG_SYS_NAND_U_BOOT_OFFS 0x40000 #define CONFIG_SYS_NAND_5_ADDR_CYCLE diff --git a/include/configs/sama5d4ek.h b/include/configs/sama5d4ek.h index 6a8026345e..33718d4eac 100644 --- a/include/configs/sama5d4ek.h +++ b/include/configs/sama5d4ek.h @@ -47,8 +47,6 @@ #ifdef CONFIG_SD_BOOT #define CONFIG_SYS_MMCSD_FS_BOOT_PARTITION 1 #define CONFIG_SPL_FS_LOAD_PAYLOAD_NAME "u-boot.img" -#elif CONFIG_NAND_BOOT -#define CONFIG_SPL_NAND_BASE #endif #define CONFIG_SYS_NAND_U_BOOT_OFFS 0x40000 #define CONFIG_SYS_NAND_5_ADDR_CYCLE diff --git a/include/configs/siemens-am33x-common.h b/include/configs/siemens-am33x-common.h index 8a7f6e5665..c4ee1219b3 100644 --- a/include/configs/siemens-am33x-common.h +++ b/include/configs/siemens-am33x-common.h @@ -86,7 +86,6 @@ #define CONFIG_SYS_MMCSD_FS_BOOT_PARTITION 1 #define CONFIG_SPL_FS_LOAD_PAYLOAD_NAME "u-boot.img" -#define CONFIG_SPL_NAND_BASE #define CONFIG_SYS_NAND_ONFI_DETECTION #define CONFIG_SYS_NAND_5_ADDR_CYCLE #define CONFIG_SYS_NAND_PAGE_COUNT (CONFIG_SYS_NAND_BLOCK_SIZE / \ diff --git a/include/configs/smartweb.h b/include/configs/smartweb.h index fb84c8f8c0..6e715dc0c1 100644 --- a/include/configs/smartweb.h +++ b/include/configs/smartweb.h @@ -176,7 +176,6 @@ #define CONFIG_SYS_NAND_ENABLE_PIN_SPL (2*32 + 14) #define CONFIG_SYS_USE_NANDFLASH 1 -#define CONFIG_SPL_NAND_BASE #define CONFIG_SPL_NAND_RAW_ONLY #define CONFIG_SPL_NAND_SOFTECC #define CONFIG_SYS_NAND_U_BOOT_OFFS 0x20000 diff --git a/include/configs/tam3517-common.h b/include/configs/tam3517-common.h index d2f5d9ed00..a98f944053 100644 --- a/include/configs/tam3517-common.h +++ b/include/configs/tam3517-common.h @@ -126,8 +126,6 @@ #define CONFIG_SPL_NAND_SOFTECC #define CONFIG_SPL_NAND_WORKSPACE 0x8f07f000 /* below BSS */ -#define CONFIG_SPL_NAND_BASE - #define CONFIG_SPL_MAX_SIZE (SRAM_SCRATCH_SPACE_ADDR - \ CONFIG_SPL_TEXT_BASE) #define CONFIG_SPL_STACK LOW_LEVEL_SRAM_STACK diff --git a/include/configs/tao3530.h b/include/configs/tao3530.h index 11ed793083..5a461c50b9 100644 --- a/include/configs/tao3530.h +++ b/include/configs/tao3530.h @@ -186,8 +186,6 @@ #define CONFIG_SYS_MMCSD_FS_BOOT_PARTITION 1 #define CONFIG_SPL_FS_LOAD_PAYLOAD_NAME "u-boot.img" -#define CONFIG_SPL_NAND_BASE - /* NAND boot config */ #define CONFIG_SYS_NAND_5_ADDR_CYCLE #define CONFIG_SYS_NAND_PAGE_COUNT 64 diff --git a/include/configs/taurus.h b/include/configs/taurus.h index 9c69a04b9e..39eae8e2ba 100644 --- a/include/configs/taurus.h +++ b/include/configs/taurus.h @@ -176,7 +176,6 @@ #define CONFIG_SYS_NAND_ENABLE_PIN_SPL (2*32 + 14) #define CONFIG_SYS_USE_NANDFLASH 1 -#define CONFIG_SPL_NAND_BASE #define CONFIG_SPL_NAND_RAW_ONLY #define CONFIG_SPL_NAND_SOFTECC #define CONFIG_SYS_NAND_U_BOOT_OFFS 0x20000 diff --git a/include/configs/ti_armv7_common.h b/include/configs/ti_armv7_common.h index 22c983bdee..4769a398c5 100644 --- a/include/configs/ti_armv7_common.h +++ b/include/configs/ti_armv7_common.h @@ -180,7 +180,6 @@ /* General parts of the framework, required. */ #ifdef CONFIG_MTD_RAW_NAND -#define CONFIG_SPL_NAND_BASE #define CONFIG_SYS_NAND_U_BOOT_START CONFIG_SYS_TEXT_BASE #endif #endif /* !CONFIG_NOR_BOOT */ diff --git a/include/configs/tricorder.h b/include/configs/tricorder.h index aaf0acfbe9..e7d57bb900 100644 --- a/include/configs/tricorder.h +++ b/include/configs/tricorder.h @@ -203,7 +203,6 @@ /* Defines for SPL */ -#define CONFIG_SPL_NAND_BASE #define CONFIG_SPL_FS_LOAD_PAYLOAD_NAME "u-boot.img" #define CONFIG_SYS_MMCSD_FS_BOOT_PARTITION 1 diff --git a/include/configs/wb45n.h b/include/configs/wb45n.h index 0533cf13d7..cc7a688580 100644 --- a/include/configs/wb45n.h +++ b/include/configs/wb45n.h @@ -113,7 +113,6 @@ #define CONFIG_SYS_MCKR 0x1301 #define CONFIG_SYS_MCKR_CSS 0x1302 -#define CONFIG_SPL_NAND_BASE #define CONFIG_SYS_NAND_U_BOOT_OFFS 0x20000 #define CONFIG_SYS_NAND_5_ADDR_CYCLE #define CONFIG_SYS_NAND_PAGE_SIZE 0x800 diff --git a/include/configs/wb50n.h b/include/configs/wb50n.h index 8090df0e30..b1f3b8452c 100644 --- a/include/configs/wb50n.h +++ b/include/configs/wb50n.h @@ -85,7 +85,6 @@ #define CONFIG_SYS_MONITOR_LEN (512 << 10) -#define CONFIG_SPL_NAND_BASE #define CONFIG_SYS_NAND_U_BOOT_OFFS 0x20000 #define CONFIG_SYS_NAND_5_ADDR_CYCLE #define CONFIG_SYS_NAND_PAGE_SIZE 0x800 diff --git a/include/configs/work_92105.h b/include/configs/work_92105.h index 4788142f5f..7874b77f3f 100644 --- a/include/configs/work_92105.h +++ b/include/configs/work_92105.h @@ -128,7 +128,6 @@ /* Use the framework and generic lib */ /* SPL will use serial */ /* SPL will load U-Boot from NAND offset 0x40000 */ -#define CONFIG_SPL_NAND_BASE #define CONFIG_SYS_NAND_U_BOOT_OFFS 0x00040000 #define CONFIG_SPL_PAD_TO 0x20000 /* U-Boot will be 0x40000 bytes, loaded and run at CONFIG_SYS_TEXT_BASE */ diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index 8d0738eb9d..90d6554f84 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -1618,8 +1618,6 @@ CONFIG_SPL_MAX_PEB_SIZE CONFIG_SPL_MAX_SIZE CONFIG_SPL_MPC83XX_WAIT_FOR_NAND CONFIG_SPL_MXS_PSWITCH_WAIT -CONFIG_SPL_NAND_BASE -CONFIG_SPL_NAND_IDENT CONFIG_SPL_NAND_INIT CONFIG_SPL_NAND_LOAD CONFIG_SPL_NAND_MINIMAL -- 2.39.5