This converts the following to Kconfig:
CONFIG_SPL_NAND_BASE
CONFIG_SPL_NAND_LOAD
CONFIG_SPL_NAND_SOFTECC
CONFIG_SPL_NAND_RAW_ONLY
Signed-off-by: Adam Ford <aford...@gmail.com>
---
README | 6 ------
configs/am335x_baltos_defconfig | 1 +
configs/am335x_evm_defconfig | 1 +
configs/am335x_evm_nor_defconfig | 1 +
configs/am335x_evm_usbspl_defconfig | 1 +
configs/am335x_hs_evm_defconfig | 1 +
configs/am335x_hs_evm_uart_defconfig | 1 +
configs/am335x_igep003x_defconfig | 1 +
configs/am3517_crane_defconfig | 1 +
configs/am3517_evm_defconfig | 1 +
configs/am43xx_evm_defconfig | 1 +
configs/am43xx_evm_ethboot_defconfig | 1 +
configs/am43xx_evm_usbhost_boot_defconfig | 1 +
configs/am43xx_hs_evm_defconfig | 1 +
configs/axm_defconfig | 3 +++
configs/brppt1_nand_defconfig | 1 +
configs/cairo_defconfig | 1 +
configs/chiliboard_defconfig | 1 +
configs/cm_t335_defconfig | 1 +
configs/cm_t35_defconfig | 1 +
configs/cm_t43_defconfig | 1 +
configs/corvus_defconfig | 3 +++
configs/devkit3250_defconfig | 2 ++
configs/devkit8000_defconfig | 1 +
configs/draco_defconfig | 1 +
configs/eco5pk_defconfig | 2 ++
configs/etamin_defconfig | 1 +
configs/igep0032_defconfig | 1 +
configs/igep00x0_defconfig | 1 +
configs/ipam390_defconfig | 2 ++
configs/k2e_evm_defconfig | 1 +
configs/k2g_evm_defconfig | 1 +
configs/k2hk_evm_defconfig | 1 +
configs/k2l_evm_defconfig | 1 +
configs/mcx_defconfig | 2 ++
configs/mt_ventoux_defconfig | 2 ++
configs/omap3_beagle_defconfig | 1 +
configs/omap3_evm_defconfig | 1 +
configs/omap3_ha_defconfig | 1 +
configs/omap3_logic_defconfig | 1 +
configs/omap3_overo_defconfig | 1 +
configs/omapl138_lcdk_defconfig | 2 ++
configs/pengwyn_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 | 3 +++
configs/tao3530_defconfig | 1 +
configs/taurus_defconfig | 3 +++
configs/thuban_defconfig | 1 +
configs/ti816x_evm_defconfig | 1 +
configs/tricorder_defconfig | 1 +
configs/tricorder_flash_defconfig | 1 +
configs/twister_defconfig | 2 ++
configs/wb45n_defconfig | 1 +
configs/wb50n_defconfig | 1 +
configs/work_92105_defconfig | 1 +
drivers/mtd/nand/Kconfig | 22 ++++++++++++++++++++++
include/configs/am3517_crane.h | 2 --
include/configs/am3517_evm.h | 2 --
include/configs/at91sam9m10g45ek.h | 2 --
include/configs/at91sam9n12ek.h | 3 ---
include/configs/at91sam9x5ek.h | 3 ---
include/configs/brppt1.h | 1 -
include/configs/cm_t35.h | 2 --
include/configs/corvus.h | 3 ---
include/configs/da850evm.h | 2 --
include/configs/devkit3250.h | 3 ---
include/configs/ipam390.h | 2 --
include/configs/mcx.h | 3 ---
include/configs/omapl138_lcdk.h | 2 --
include/configs/sama5d3_xplained.h | 3 ---
include/configs/sama5d3xek.h | 3 ---
include/configs/sama5d4_xplained.h | 3 ---
include/configs/sama5d4ek.h | 3 ---
include/configs/siemens-am33x-common.h | 1 -
include/configs/smartweb.h | 3 ---
include/configs/tam3517-common.h | 3 ---
include/configs/tao3530.h | 2 --
include/configs/taurus.h | 3 ---
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 | 4 ----
90 files changed, 97 insertions(+), 69 deletions(-)
diff --git a/README b/README
index a09912d..a403a4b 100644
--- a/README
+++ b/README
@@ -2775,8 +2775,6 @@ FIT uImage format:
CONFIG_SPL_SKIP_RELOCATE
Avoid SPL relocation
- CONFIG_SPL_NAND_BASE
- Include nand_base.c in the SPL. Requires
CONFIG_SPL_NAND_DRIVERS
SPL uses normal NAND drivers, not minimal drivers.
@@ -2788,10 +2786,6 @@ FIT uImage format:
Support for a lightweight UBI (fastmap) scanner and
loader
- CONFIG_SPL_NAND_RAW_ONLY
- Support to boot only raw u-boot.bin images. Use this only
- if you need to save space.
-
CONFIG_SPL_COMMON_INIT_DDR
Set for common ddr init with serial presence detect in
SPL binary.
diff --git a/configs/am335x_baltos_defconfig b/configs/am335x_baltos_defconfig
index 1a971fd..19ea684 100644
--- a/configs/am335x_baltos_defconfig
+++ b/configs/am335x_baltos_defconfig
@@ -51,6 +51,7 @@ CONFIG_ISO_PARTITION=y
CONFIG_MMC_OMAP_HS=y
CONFIG_NAND=y
CONFIG_SPL_NAND_DRIVERS=y
+CONFIG_SPL_NAND_BASE=y
CONFIG_SPL_NAND_ECC=y
CONFIG_PHYLIB=y
CONFIG_SYS_NS16550=y
diff --git a/configs/am335x_evm_defconfig b/configs/am335x_evm_defconfig
index 151a7ed..39a5bbe 100644
--- a/configs/am335x_evm_defconfig
+++ b/configs/am335x_evm_defconfig
@@ -35,6 +35,7 @@ CONFIG_DM_MMC=y
CONFIG_MMC_OMAP_HS=y
CONFIG_NAND=y
CONFIG_SPL_NAND_DRIVERS=y
+CONFIG_SPL_NAND_BASE=y
CONFIG_SPL_NAND_ECC=y
CONFIG_SPI_FLASH=y
CONFIG_SPI_FLASH_WINBOND=y
diff --git a/configs/am335x_evm_nor_defconfig b/configs/am335x_evm_nor_defconfig
index 4f55fc0..654a9a1 100644
--- a/configs/am335x_evm_nor_defconfig
+++ b/configs/am335x_evm_nor_defconfig
@@ -28,6 +28,7 @@ CONFIG_MMC_OMAP_HS=y
CONFIG_MTD_NOR_FLASH=y
CONFIG_NAND=y
CONFIG_SPL_NAND_DRIVERS=y
+CONFIG_SPL_NAND_BASE=y
CONFIG_SPL_NAND_ECC=y
CONFIG_SPI_FLASH=y
CONFIG_SPI_FLASH_WINBOND=y
diff --git a/configs/am335x_evm_usbspl_defconfig
b/configs/am335x_evm_usbspl_defconfig
index d04c157..250d8eb 100644
--- a/configs/am335x_evm_usbspl_defconfig
+++ b/configs/am335x_evm_usbspl_defconfig
@@ -32,6 +32,7 @@ CONFIG_DFU_RAM=y
CONFIG_MMC_OMAP_HS=y
CONFIG_NAND=y
CONFIG_SPL_NAND_DRIVERS=y
+CONFIG_SPL_NAND_BASE=y
CONFIG_SPL_NAND_ECC=y
CONFIG_SPI_FLASH=y
CONFIG_SPI_FLASH_WINBOND=y
diff --git a/configs/am335x_hs_evm_defconfig b/configs/am335x_hs_evm_defconfig
index 34ad928..bec07e9 100644
--- a/configs/am335x_hs_evm_defconfig
+++ b/configs/am335x_hs_evm_defconfig
@@ -44,6 +44,7 @@ CONFIG_DM_MMC=y
CONFIG_MMC_OMAP_HS=y
CONFIG_NAND=y
CONFIG_SPL_NAND_DRIVERS=y
+CONFIG_SPL_NAND_BASE=y
CONFIG_SPL_NAND_ECC=y
CONFIG_SPI_FLASH=y
CONFIG_SPI_FLASH_WINBOND=y
diff --git a/configs/am335x_hs_evm_uart_defconfig
b/configs/am335x_hs_evm_uart_defconfig
index d51a323..d315f97 100644
--- a/configs/am335x_hs_evm_uart_defconfig
+++ b/configs/am335x_hs_evm_uart_defconfig
@@ -41,6 +41,7 @@ CONFIG_DM_MMC=y
CONFIG_MMC_OMAP_HS=y
CONFIG_NAND=y
CONFIG_SPL_NAND_DRIVERS=y
+CONFIG_SPL_NAND_BASE=y
CONFIG_SPL_NAND_ECC=y
CONFIG_SPI_FLASH=y
CONFIG_SPI_FLASH_WINBOND=y
diff --git a/configs/am335x_igep003x_defconfig
b/configs/am335x_igep003x_defconfig
index 414fd77..7b496bb 100644
--- a/configs/am335x_igep003x_defconfig
+++ b/configs/am335x_igep003x_defconfig
@@ -53,6 +53,7 @@ CONFIG_ENV_IS_IN_UBI=y
CONFIG_MMC_OMAP_HS=y
CONFIG_NAND=y
CONFIG_SPL_NAND_DRIVERS=y
+CONFIG_SPL_NAND_BASE=y
CONFIG_SPL_NAND_ECC=y
CONFIG_MTD_UBI_FASTMAP=y
CONFIG_PHYLIB=y
diff --git a/configs/am3517_crane_defconfig b/configs/am3517_crane_defconfig
index d605fb5..3d9834f 100644
--- a/configs/am3517_crane_defconfig
+++ b/configs/am3517_crane_defconfig
@@ -30,6 +30,7 @@ CONFIG_MMC_OMAP_HS=y
CONFIG_NAND=y
CONFIG_SYS_NAND_BUSWIDTH_16BIT=y
CONFIG_SPL_NAND_DRIVERS=y
+CONFIG_SPL_NAND_BASE=y
CONFIG_SPL_NAND_ECC=y
CONFIG_SPL_NAND_SIMPLE=y
CONFIG_SYS_NS16550=y
diff --git a/configs/am3517_evm_defconfig b/configs/am3517_evm_defconfig
index 5c0c8a1..658af75 100644
--- a/configs/am3517_evm_defconfig
+++ b/configs/am3517_evm_defconfig
@@ -38,6 +38,7 @@ CONFIG_MMC_OMAP_HS=y
CONFIG_NAND=y
CONFIG_SYS_NAND_BUSWIDTH_16BIT=y
CONFIG_SPL_NAND_DRIVERS=y
+CONFIG_SPL_NAND_BASE=y
CONFIG_SPL_NAND_ECC=y
CONFIG_SPL_NAND_SIMPLE=y
CONFIG_SYS_NS16550=y
diff --git a/configs/am43xx_evm_defconfig b/configs/am43xx_evm_defconfig
index d9269ec..e78032d 100644
--- a/configs/am43xx_evm_defconfig
+++ b/configs/am43xx_evm_defconfig
@@ -35,6 +35,7 @@ CONFIG_DM_MMC=y
CONFIG_MMC_OMAP_HS=y
CONFIG_NAND=y
CONFIG_SPL_NAND_DRIVERS=y
+CONFIG_SPL_NAND_BASE=y
CONFIG_SPL_NAND_ECC=y
CONFIG_SPI_FLASH=y
CONFIG_SPI_FLASH_MACRONIX=y
diff --git a/configs/am43xx_evm_ethboot_defconfig
b/configs/am43xx_evm_ethboot_defconfig
index 2ec4a83..f69ebcf 100644
--- a/configs/am43xx_evm_ethboot_defconfig
+++ b/configs/am43xx_evm_ethboot_defconfig
@@ -50,6 +50,7 @@ CONFIG_DFU_SF=y
CONFIG_MMC_OMAP_HS=y
CONFIG_NAND=y
CONFIG_SPL_NAND_DRIVERS=y
+CONFIG_SPL_NAND_BASE=y
CONFIG_SPL_NAND_ECC=y
CONFIG_SPI_FLASH=y
CONFIG_SPI_FLASH_MACRONIX=y
diff --git a/configs/am43xx_evm_usbhost_boot_defconfig
b/configs/am43xx_evm_usbhost_boot_defconfig
index b7d18fc..b266f65 100644
--- a/configs/am43xx_evm_usbhost_boot_defconfig
+++ b/configs/am43xx_evm_usbhost_boot_defconfig
@@ -58,6 +58,7 @@ CONFIG_DM_MMC=y
CONFIG_MMC_OMAP_HS=y
CONFIG_NAND=y
CONFIG_SPL_NAND_DRIVERS=y
+CONFIG_SPL_NAND_BASE=y
CONFIG_SPL_NAND_ECC=y
CONFIG_SPI_FLASH=y
CONFIG_SPI_FLASH_MACRONIX=y
diff --git a/configs/am43xx_hs_evm_defconfig b/configs/am43xx_hs_evm_defconfig
index a94a2f1..d420957 100644
--- a/configs/am43xx_hs_evm_defconfig
+++ b/configs/am43xx_hs_evm_defconfig
@@ -46,6 +46,7 @@ CONFIG_DM_MMC=y
CONFIG_MMC_OMAP_HS=y
CONFIG_NAND=y
CONFIG_SPL_NAND_DRIVERS=y
+CONFIG_SPL_NAND_BASE=y
CONFIG_SPL_NAND_ECC=y
CONFIG_SPI_FLASH=y
CONFIG_SPI_FLASH_MACRONIX=y
diff --git a/configs/axm_defconfig b/configs/axm_defconfig
index 23dc557..bfa696e 100644
--- a/configs/axm_defconfig
+++ b/configs/axm_defconfig
@@ -40,7 +40,10 @@ CONFIG_ENV_IS_IN_NAND=y
CONFIG_NAND=y
CONFIG_NAND_ATMEL=y
CONFIG_SPL_NAND_DRIVERS=y
+CONFIG_SPL_NAND_BASE=y
CONFIG_SPL_NAND_ECC=y
+CONFIG_SPL_NAND_SOFTECC=y
+CONFIG_SPL_NAND_RAW_ONLY=y
CONFIG_SPI_FLASH=y
CONFIG_SPI_FLASH_STMICRO=y
CONFIG_PHYLIB=y
diff --git a/configs/brppt1_nand_defconfig b/configs/brppt1_nand_defconfig
index 3c58bf3..cf269d6 100644
--- a/configs/brppt1_nand_defconfig
+++ b/configs/brppt1_nand_defconfig
@@ -55,6 +55,7 @@ CONFIG_NETCONSOLE=y
# CONFIG_MMC is not set
CONFIG_NAND=y
CONFIG_SPL_NAND_DRIVERS=y
+CONFIG_SPL_NAND_BASE=y
CONFIG_SPL_NAND_ECC=y
CONFIG_PHYLIB=y
CONFIG_SYS_NS16550=y
diff --git a/configs/cairo_defconfig b/configs/cairo_defconfig
index 1c83d02..3ca7063 100644
--- a/configs/cairo_defconfig
+++ b/configs/cairo_defconfig
@@ -41,6 +41,7 @@ CONFIG_ENV_IS_IN_NAND=y
CONFIG_MMC_OMAP_HS=y
CONFIG_NAND=y
CONFIG_SPL_NAND_DRIVERS=y
+CONFIG_SPL_NAND_BASE=y
CONFIG_SPL_NAND_ECC=y
CONFIG_SPL_NAND_SIMPLE=y
CONFIG_SYS_NS16550=y
diff --git a/configs/chiliboard_defconfig b/configs/chiliboard_defconfig
index 7d10aa9..8bf5605 100644
--- a/configs/chiliboard_defconfig
+++ b/configs/chiliboard_defconfig
@@ -42,6 +42,7 @@ CONFIG_DM_GPIO=y
CONFIG_MMC_OMAP_HS=y
CONFIG_NAND=y
CONFIG_SPL_NAND_DRIVERS=y
+CONFIG_SPL_NAND_BASE=y
CONFIG_SPL_NAND_ECC=y
CONFIG_PHYLIB=y
CONFIG_SYS_NS16550=y
diff --git a/configs/cm_t335_defconfig b/configs/cm_t335_defconfig
index e13accd..1e98f75 100644
--- a/configs/cm_t335_defconfig
+++ b/configs/cm_t335_defconfig
@@ -56,6 +56,7 @@ CONFIG_LED_STATUS_BOOT=0
CONFIG_MMC_OMAP_HS=y
CONFIG_NAND=y
CONFIG_SPL_NAND_DRIVERS=y
+CONFIG_SPL_NAND_BASE=y
CONFIG_SPL_NAND_ECC=y
CONFIG_PHYLIB=y
CONFIG_SYS_NS16550=y
diff --git a/configs/cm_t35_defconfig b/configs/cm_t35_defconfig
index 62e7f4d..6255067 100644
--- a/configs/cm_t35_defconfig
+++ b/configs/cm_t35_defconfig
@@ -43,6 +43,7 @@ CONFIG_LED_STATUS_BOOT=0
CONFIG_MMC_OMAP_HS=y
CONFIG_NAND=y
CONFIG_SPL_NAND_DRIVERS=y
+CONFIG_SPL_NAND_BASE=y
CONFIG_SPL_NAND_ECC=y
CONFIG_SPL_NAND_SIMPLE=y
CONFIG_NETDEVICES=y
diff --git a/configs/cm_t43_defconfig b/configs/cm_t43_defconfig
index 6a24574..ccfcd5f 100644
--- a/configs/cm_t43_defconfig
+++ b/configs/cm_t43_defconfig
@@ -57,6 +57,7 @@ CONFIG_DM_GPIO=y
CONFIG_MMC_OMAP_HS=y
CONFIG_NAND=y
CONFIG_SPL_NAND_DRIVERS=y
+CONFIG_SPL_NAND_BASE=y
CONFIG_SPL_NAND_ECC=y
CONFIG_SPI_FLASH=y
CONFIG_SPI_FLASH_BAR=y
diff --git a/configs/corvus_defconfig b/configs/corvus_defconfig
index cb07e07..38a979c 100644
--- a/configs/corvus_defconfig
+++ b/configs/corvus_defconfig
@@ -44,7 +44,10 @@ CONFIG_DFU_NAND=y
CONFIG_NAND=y
CONFIG_NAND_ATMEL=y
CONFIG_SPL_NAND_DRIVERS=y
+CONFIG_SPL_NAND_BASE=y
CONFIG_SPL_NAND_ECC=y
+CONFIG_SPL_NAND_SOFTECC=y
+CONFIG_SPL_NAND_RAW_ONLY=y
CONFIG_PHYLIB=y
# CONFIG_SPL_DM_SERIAL is not set
CONFIG_ATMEL_USART=y
diff --git a/configs/devkit3250_defconfig b/configs/devkit3250_defconfig
index 7597579..bfae568 100644
--- a/configs/devkit3250_defconfig
+++ b/configs/devkit3250_defconfig
@@ -37,6 +37,8 @@ CONFIG_MTD_NOR_FLASH=y
CONFIG_NAND=y
CONFIG_SPL_NAND_DRIVERS=y
CONFIG_SPL_NAND_ECC=y
+CONFIG_SPL_NAND_SOFTECC=y
+CONFIG_SPL_NAND_RAW_ONLY=y
CONFIG_SPL_NAND_SIMPLE=y
CONFIG_PHYLIB=y
CONFIG_DM_SERIAL=y
diff --git a/configs/devkit8000_defconfig b/configs/devkit8000_defconfig
index dc5c169..9527106 100644
--- a/configs/devkit8000_defconfig
+++ b/configs/devkit8000_defconfig
@@ -36,6 +36,7 @@ CONFIG_MMC_OMAP_HS=y
CONFIG_NAND=y
CONFIG_SYS_NAND_BUSWIDTH_16BIT=y
CONFIG_SPL_NAND_DRIVERS=y
+CONFIG_SPL_NAND_BASE=y
CONFIG_SPL_NAND_ECC=y
CONFIG_SPL_NAND_SIMPLE=y
CONFIG_SYS_NS16550=y
diff --git a/configs/draco_defconfig b/configs/draco_defconfig
index d517b05..cec52e2 100644
--- a/configs/draco_defconfig
+++ b/configs/draco_defconfig
@@ -56,6 +56,7 @@ CONFIG_DFU_NAND=y
CONFIG_MMC_OMAP_HS=y
CONFIG_NAND=y
CONFIG_SPL_NAND_DRIVERS=y
+CONFIG_SPL_NAND_BASE=y
CONFIG_SPL_NAND_ECC=y
CONFIG_SPI_FLASH=y
CONFIG_SPI_FLASH_WINBOND=y
diff --git a/configs/eco5pk_defconfig b/configs/eco5pk_defconfig
index 5477405..dac6aac 100644
--- a/configs/eco5pk_defconfig
+++ b/configs/eco5pk_defconfig
@@ -31,7 +31,9 @@ CONFIG_MMC_OMAP_HS=y
CONFIG_NAND=y
CONFIG_SYS_NAND_BUSWIDTH_16BIT=y
CONFIG_SPL_NAND_DRIVERS=y
+CONFIG_SPL_NAND_BASE=y
CONFIG_SPL_NAND_ECC=y
+CONFIG_SPL_NAND_SOFTECC=y
CONFIG_SPL_NAND_SIMPLE=y
CONFIG_SYS_NS16550=y
CONFIG_USB=y
diff --git a/configs/etamin_defconfig b/configs/etamin_defconfig
index f264b94..4be4fc1 100644
--- a/configs/etamin_defconfig
+++ b/configs/etamin_defconfig
@@ -57,6 +57,7 @@ CONFIG_MMC_OMAP_HS=y
CONFIG_NAND=y
CONFIG_SYS_MAX_NAND_DEVICE=3
CONFIG_SPL_NAND_DRIVERS=y
+CONFIG_SPL_NAND_BASE=y
CONFIG_SPL_NAND_ECC=y
CONFIG_SPI_FLASH=y
CONFIG_SPI_FLASH_WINBOND=y
diff --git a/configs/igep0032_defconfig b/configs/igep0032_defconfig
index 9d87bc3..bc97929 100644
--- a/configs/igep0032_defconfig
+++ b/configs/igep0032_defconfig
@@ -34,6 +34,7 @@ CONFIG_MMC_OMAP_HS=y
CONFIG_NAND=y
CONFIG_SYS_NAND_BUSWIDTH_16BIT=y
CONFIG_SPL_NAND_DRIVERS=y
+CONFIG_SPL_NAND_BASE=y
CONFIG_SPL_NAND_ECC=y
CONFIG_SPL_NAND_SIMPLE=y
CONFIG_NETDEVICES=y
diff --git a/configs/igep00x0_defconfig b/configs/igep00x0_defconfig
index 9d655cd..dc296ee 100644
--- a/configs/igep00x0_defconfig
+++ b/configs/igep00x0_defconfig
@@ -34,6 +34,7 @@ CONFIG_MMC_OMAP_HS=y
CONFIG_NAND=y
CONFIG_SYS_NAND_BUSWIDTH_16BIT=y
CONFIG_SPL_NAND_DRIVERS=y
+CONFIG_SPL_NAND_BASE=y
CONFIG_SPL_NAND_ECC=y
CONFIG_SPL_NAND_SIMPLE=y
CONFIG_MTD_UBI_FASTMAP=y
diff --git a/configs/ipam390_defconfig b/configs/ipam390_defconfig
index d39acf9..fb74d58 100644
--- a/configs/ipam390_defconfig
+++ b/configs/ipam390_defconfig
@@ -37,5 +37,7 @@ CONFIG_ENV_IS_IN_NAND=y
CONFIG_NAND=y
CONFIG_NAND_DAVINCI=y
CONFIG_SPL_NAND_DRIVERS=y
+CONFIG_SPL_NAND_BASE=y
+CONFIG_SPL_NAND_LOAD=y
CONFIG_SPL_NAND_ECC=y
CONFIG_SYS_NS16550=y
diff --git a/configs/k2e_evm_defconfig b/configs/k2e_evm_defconfig
index 6274452..06690b6 100644
--- a/configs/k2e_evm_defconfig
+++ b/configs/k2e_evm_defconfig
@@ -40,6 +40,7 @@ CONFIG_TI_AEMIF=y
CONFIG_NAND=y
CONFIG_NAND_DAVINCI=y
CONFIG_SPL_NAND_DRIVERS=y
+CONFIG_SPL_NAND_BASE=y
CONFIG_SPL_NAND_ECC=y
CONFIG_DM_SPI_FLASH=y
CONFIG_SPI_FLASH=y
diff --git a/configs/k2g_evm_defconfig b/configs/k2g_evm_defconfig
index 5e86f65..54b43b1 100644
--- a/configs/k2g_evm_defconfig
+++ b/configs/k2g_evm_defconfig
@@ -39,6 +39,7 @@ CONFIG_MMC_OMAP_HS=y
CONFIG_NAND=y
CONFIG_NAND_DAVINCI=y
CONFIG_SPL_NAND_DRIVERS=y
+CONFIG_SPL_NAND_BASE=y
CONFIG_SPL_NAND_ECC=y
CONFIG_DM_SPI_FLASH=y
CONFIG_SPI_FLASH=y
diff --git a/configs/k2hk_evm_defconfig b/configs/k2hk_evm_defconfig
index cef43a4..b25dd7e 100644
--- a/configs/k2hk_evm_defconfig
+++ b/configs/k2hk_evm_defconfig
@@ -40,6 +40,7 @@ CONFIG_TI_AEMIF=y
CONFIG_NAND=y
CONFIG_NAND_DAVINCI=y
CONFIG_SPL_NAND_DRIVERS=y
+CONFIG_SPL_NAND_BASE=y
CONFIG_SPL_NAND_ECC=y
CONFIG_DM_SPI_FLASH=y
CONFIG_SPI_FLASH=y
diff --git a/configs/k2l_evm_defconfig b/configs/k2l_evm_defconfig
index 3480f39..811be61 100644
--- a/configs/k2l_evm_defconfig
+++ b/configs/k2l_evm_defconfig
@@ -40,6 +40,7 @@ CONFIG_TI_AEMIF=y
CONFIG_NAND=y
CONFIG_NAND_DAVINCI=y
CONFIG_SPL_NAND_DRIVERS=y
+CONFIG_SPL_NAND_BASE=y
CONFIG_SPL_NAND_ECC=y
CONFIG_DM_SPI_FLASH=y
CONFIG_SPI_FLASH=y
diff --git a/configs/mcx_defconfig b/configs/mcx_defconfig
index 4868cf2..5b3a9eb 100644
--- a/configs/mcx_defconfig
+++ b/configs/mcx_defconfig
@@ -39,7 +39,9 @@ CONFIG_MMC_OMAP_HS=y
CONFIG_NAND=y
CONFIG_SYS_NAND_BUSWIDTH_16BIT=y
CONFIG_SPL_NAND_DRIVERS=y
+CONFIG_SPL_NAND_BASE=y
CONFIG_SPL_NAND_ECC=y
+CONFIG_SPL_NAND_SOFTECC=y
CONFIG_SPL_NAND_SIMPLE=y
CONFIG_SYS_NS16550=y
CONFIG_USB=y
diff --git a/configs/mt_ventoux_defconfig b/configs/mt_ventoux_defconfig
index 9d1bfd7..fc184d7 100644
--- a/configs/mt_ventoux_defconfig
+++ b/configs/mt_ventoux_defconfig
@@ -36,7 +36,9 @@ CONFIG_MMC_OMAP_HS=y
CONFIG_NAND=y
CONFIG_SYS_NAND_BUSWIDTH_16BIT=y
CONFIG_SPL_NAND_DRIVERS=y
+CONFIG_SPL_NAND_BASE=y
CONFIG_SPL_NAND_ECC=y
+CONFIG_SPL_NAND_SOFTECC=y
CONFIG_SPL_NAND_SIMPLE=y
CONFIG_SYS_NS16550=y
CONFIG_USB=y
diff --git a/configs/omap3_beagle_defconfig b/configs/omap3_beagle_defconfig
index 3c4fa4b..9624540 100644
--- a/configs/omap3_beagle_defconfig
+++ b/configs/omap3_beagle_defconfig
@@ -47,6 +47,7 @@ CONFIG_MMC_OMAP_HS=y
CONFIG_NAND=y
CONFIG_SYS_NAND_BUSWIDTH_16BIT=y
CONFIG_SPL_NAND_DRIVERS=y
+CONFIG_SPL_NAND_BASE=y
CONFIG_SPL_NAND_ECC=y
CONFIG_SPL_NAND_SIMPLE=y
CONFIG_SYS_NS16550=y
diff --git a/configs/omap3_evm_defconfig b/configs/omap3_evm_defconfig
index 275d27f..4092c61 100644
--- a/configs/omap3_evm_defconfig
+++ b/configs/omap3_evm_defconfig
@@ -45,6 +45,7 @@ CONFIG_MTD=y
CONFIG_NAND=y
CONFIG_SYS_NAND_BUSWIDTH_16BIT=y
CONFIG_SPL_NAND_DRIVERS=y
+CONFIG_SPL_NAND_BASE=y
CONFIG_SPL_NAND_ECC=y
CONFIG_SPL_NAND_SIMPLE=y
CONFIG_NETDEVICES=y
diff --git a/configs/omap3_ha_defconfig b/configs/omap3_ha_defconfig
index a006527..9cdf812 100644
--- a/configs/omap3_ha_defconfig
+++ b/configs/omap3_ha_defconfig
@@ -30,6 +30,7 @@ CONFIG_MMC_OMAP_HS=y
CONFIG_NAND=y
CONFIG_SYS_NAND_BUSWIDTH_16BIT=y
CONFIG_SPL_NAND_DRIVERS=y
+CONFIG_SPL_NAND_BASE=y
CONFIG_SPL_NAND_ECC=y
CONFIG_SPL_NAND_SIMPLE=y
CONFIG_SYS_NS16550=y
diff --git a/configs/omap3_logic_defconfig b/configs/omap3_logic_defconfig
index e0a7e02..39b951f 100644
--- a/configs/omap3_logic_defconfig
+++ b/configs/omap3_logic_defconfig
@@ -43,6 +43,7 @@ CONFIG_SYS_NAND_BUSWIDTH_16BIT=y
CONFIG_SYS_NAND_U_BOOT_LOCATIONS=y
CONFIG_SYS_NAND_U_BOOT_OFFS=0x80000
CONFIG_SPL_NAND_DRIVERS=y
+CONFIG_SPL_NAND_BASE=y
CONFIG_SPL_NAND_ECC=y
CONFIG_SPL_NAND_SIMPLE=y
CONFIG_NETDEVICES=y
diff --git a/configs/omap3_overo_defconfig b/configs/omap3_overo_defconfig
index 80c7f80..3169704 100644
--- a/configs/omap3_overo_defconfig
+++ b/configs/omap3_overo_defconfig
@@ -46,6 +46,7 @@ CONFIG_MMC_OMAP_HS=y
CONFIG_NAND=y
CONFIG_SYS_NAND_BUSWIDTH_16BIT=y
CONFIG_SPL_NAND_DRIVERS=y
+CONFIG_SPL_NAND_BASE=y
CONFIG_SPL_NAND_ECC=y
CONFIG_SPL_NAND_SIMPLE=y
CONFIG_NETDEVICES=y
diff --git a/configs/omapl138_lcdk_defconfig b/configs/omapl138_lcdk_defconfig
index 02f0bda..3e51162 100644
--- a/configs/omapl138_lcdk_defconfig
+++ b/configs/omapl138_lcdk_defconfig
@@ -34,6 +34,8 @@ CONFIG_SYS_NAND_BUSWIDTH_16BIT=y
CONFIG_SYS_NAND_U_BOOT_LOCATIONS=y
CONFIG_SYS_NAND_U_BOOT_OFFS=0x28000
CONFIG_SPL_NAND_DRIVERS=y
+CONFIG_SPL_NAND_BASE=y
+CONFIG_SPL_NAND_LOAD=y
CONFIG_SPL_NAND_ECC=y
CONFIG_SPL_NAND_SIMPLE=y
CONFIG_SPI_FLASH=y
diff --git a/configs/pengwyn_defconfig b/configs/pengwyn_defconfig
index 5656776..61fa055 100644
--- a/configs/pengwyn_defconfig
+++ b/configs/pengwyn_defconfig
@@ -58,6 +58,7 @@ CONFIG_ENV_IS_IN_NAND=y
CONFIG_MMC_OMAP_HS=y
CONFIG_NAND=y
CONFIG_SPL_NAND_DRIVERS=y
+CONFIG_SPL_NAND_BASE=y
CONFIG_SPL_NAND_ECC=y
CONFIG_PHYLIB=y
CONFIG_SYS_NS16550=y
diff --git a/configs/pxm2_defconfig b/configs/pxm2_defconfig
index 3bd223a..4973395 100644
--- a/configs/pxm2_defconfig
+++ b/configs/pxm2_defconfig
@@ -59,6 +59,7 @@ CONFIG_DFU_NAND=y
CONFIG_MMC_OMAP_HS=y
CONFIG_NAND=y
CONFIG_SPL_NAND_DRIVERS=y
+CONFIG_SPL_NAND_BASE=y
CONFIG_SPL_NAND_ECC=y
CONFIG_SPI_FLASH=y
CONFIG_SPI_FLASH_WINBOND=y
diff --git a/configs/rastaban_defconfig b/configs/rastaban_defconfig
index 207d893..edf699e 100644
--- a/configs/rastaban_defconfig
+++ b/configs/rastaban_defconfig
@@ -56,6 +56,7 @@ CONFIG_DFU_NAND=y
CONFIG_MMC_OMAP_HS=y
CONFIG_NAND=y
CONFIG_SPL_NAND_DRIVERS=y
+CONFIG_SPL_NAND_BASE=y
CONFIG_SPL_NAND_ECC=y
CONFIG_SPI_FLASH=y
CONFIG_SPI_FLASH_WINBOND=y
diff --git a/configs/rut_defconfig b/configs/rut_defconfig
index ffd42e4..ab90081 100644
--- a/configs/rut_defconfig
+++ b/configs/rut_defconfig
@@ -60,6 +60,7 @@ CONFIG_DFU_NAND=y
CONFIG_MMC_OMAP_HS=y
CONFIG_NAND=y
CONFIG_SPL_NAND_DRIVERS=y
+CONFIG_SPL_NAND_BASE=y
CONFIG_SPL_NAND_ECC=y
CONFIG_SPI_FLASH=y
CONFIG_SPI_FLASH_WINBOND=y
diff --git a/configs/sama5d3_xplained_nandflash_defconfig
b/configs/sama5d3_xplained_nandflash_defconfig
index 07962fc..1a69ff7 100644
--- a/configs/sama5d3_xplained_nandflash_defconfig
+++ b/configs/sama5d3_xplained_nandflash_defconfig
@@ -54,6 +54,7 @@ CONFIG_GENERIC_ATMEL_MCI=y
CONFIG_NAND=y
CONFIG_NAND_ATMEL=y
CONFIG_SPL_NAND_DRIVERS=y
+CONFIG_SPL_NAND_BASE=y
CONFIG_DM_ETH=y
CONFIG_MACB=y
CONFIG_PINCTRL=y
diff --git a/configs/sama5d3xek_nandflash_defconfig
b/configs/sama5d3xek_nandflash_defconfig
index 453183e..b59e5a9 100644
--- a/configs/sama5d3xek_nandflash_defconfig
+++ b/configs/sama5d3xek_nandflash_defconfig
@@ -55,6 +55,7 @@ CONFIG_MTD_NOR_FLASH=y
CONFIG_NAND=y
CONFIG_NAND_ATMEL=y
CONFIG_SPL_NAND_DRIVERS=y
+CONFIG_SPL_NAND_BASE=y
CONFIG_DM_SPI_FLASH=y
CONFIG_SPI_FLASH=y
CONFIG_SPI_FLASH_ATMEL=y
diff --git a/configs/sama5d4_xplained_nandflash_defconfig
b/configs/sama5d4_xplained_nandflash_defconfig
index 2117aa8..786fd3a 100644
--- a/configs/sama5d4_xplained_nandflash_defconfig
+++ b/configs/sama5d4_xplained_nandflash_defconfig
@@ -52,6 +52,7 @@ CONFIG_GENERIC_ATMEL_MCI=y
CONFIG_NAND=y
CONFIG_NAND_ATMEL=y
CONFIG_SPL_NAND_DRIVERS=y
+CONFIG_SPL_NAND_BASE=y
CONFIG_DM_SPI_FLASH=y
CONFIG_SPI_FLASH=y
CONFIG_SPI_FLASH_ATMEL=y
diff --git a/configs/sama5d4ek_nandflash_defconfig
b/configs/sama5d4ek_nandflash_defconfig
index 652a509..98103cb 100644
--- a/configs/sama5d4ek_nandflash_defconfig
+++ b/configs/sama5d4ek_nandflash_defconfig
@@ -52,6 +52,7 @@ CONFIG_GENERIC_ATMEL_MCI=y
CONFIG_NAND=y
CONFIG_NAND_ATMEL=y
CONFIG_SPL_NAND_DRIVERS=y
+CONFIG_SPL_NAND_BASE=y
CONFIG_DM_SPI_FLASH=y
CONFIG_SPI_FLASH=y
CONFIG_SPI_FLASH_ATMEL=y
diff --git a/configs/smartweb_defconfig b/configs/smartweb_defconfig
index 139944d..2700a83 100644
--- a/configs/smartweb_defconfig
+++ b/configs/smartweb_defconfig
@@ -47,7 +47,10 @@ CONFIG_DFU_NAND=y
CONFIG_NAND=y
CONFIG_NAND_ATMEL=y
CONFIG_SPL_NAND_DRIVERS=y
+CONFIG_SPL_NAND_BASE=y
CONFIG_SPL_NAND_ECC=y
+CONFIG_SPL_NAND_SOFTECC=y
+CONFIG_SPL_NAND_RAW_ONLY=y
CONFIG_PHYLIB=y
CONFIG_USB=y
CONFIG_DM_USB=y
diff --git a/configs/tao3530_defconfig b/configs/tao3530_defconfig
index eeefb13..3e2788e 100644
--- a/configs/tao3530_defconfig
+++ b/configs/tao3530_defconfig
@@ -30,6 +30,7 @@ CONFIG_MMC_OMAP_HS=y
CONFIG_NAND=y
CONFIG_SYS_NAND_BUSWIDTH_16BIT=y
CONFIG_SPL_NAND_DRIVERS=y
+CONFIG_SPL_NAND_BASE=y
CONFIG_SPL_NAND_ECC=y
CONFIG_SPL_NAND_SIMPLE=y
CONFIG_SYS_NS16550=y
diff --git a/configs/taurus_defconfig b/configs/taurus_defconfig
index 11eec76..6a451b8 100644
--- a/configs/taurus_defconfig
+++ b/configs/taurus_defconfig
@@ -50,7 +50,10 @@ CONFIG_DFU_NAND=y
CONFIG_NAND=y
CONFIG_NAND_ATMEL=y
CONFIG_SPL_NAND_DRIVERS=y
+CONFIG_SPL_NAND_BASE=y
CONFIG_SPL_NAND_ECC=y
+CONFIG_SPL_NAND_SOFTECC=y
+CONFIG_SPL_NAND_RAW_ONLY=y
CONFIG_SPI_FLASH=y
CONFIG_SPI_FLASH_STMICRO=y
CONFIG_PHYLIB=y
diff --git a/configs/thuban_defconfig b/configs/thuban_defconfig
index efe6389..5a6f677 100644
--- a/configs/thuban_defconfig
+++ b/configs/thuban_defconfig
@@ -56,6 +56,7 @@ CONFIG_DFU_NAND=y
CONFIG_MMC_OMAP_HS=y
CONFIG_NAND=y
CONFIG_SPL_NAND_DRIVERS=y
+CONFIG_SPL_NAND_BASE=y
CONFIG_SPL_NAND_ECC=y
CONFIG_SPI_FLASH=y
CONFIG_SPI_FLASH_WINBOND=y
diff --git a/configs/ti816x_evm_defconfig b/configs/ti816x_evm_defconfig
index b72d47e..dd1a517 100644
--- a/configs/ti816x_evm_defconfig
+++ b/configs/ti816x_evm_defconfig
@@ -46,6 +46,7 @@ CONFIG_MMC_OMAP_HS=y
CONFIG_NAND=y
CONFIG_SYS_NAND_BUSWIDTH_16BIT=y
CONFIG_SPL_NAND_DRIVERS=y
+CONFIG_SPL_NAND_BASE=y
CONFIG_SPL_NAND_ECC=y
CONFIG_SYS_NS16550=y
CONFIG_OMAP3_SPI=y
diff --git a/configs/tricorder_defconfig b/configs/tricorder_defconfig
index 6b69568..a180945 100644
--- a/configs/tricorder_defconfig
+++ b/configs/tricorder_defconfig
@@ -39,6 +39,7 @@ CONFIG_LED_STATUS_CMD=y
CONFIG_MMC_OMAP_HS=y
CONFIG_NAND=y
CONFIG_SPL_NAND_DRIVERS=y
+CONFIG_SPL_NAND_BASE=y
CONFIG_SPL_NAND_ECC=y
CONFIG_SPL_NAND_SIMPLE=y
CONFIG_SYS_NS16550=y
diff --git a/configs/tricorder_flash_defconfig
b/configs/tricorder_flash_defconfig
index e5302b4..d35673e 100644
--- a/configs/tricorder_flash_defconfig
+++ b/configs/tricorder_flash_defconfig
@@ -38,6 +38,7 @@ CONFIG_LED_STATUS_CMD=y
CONFIG_MMC_OMAP_HS=y
CONFIG_NAND=y
CONFIG_SPL_NAND_DRIVERS=y
+CONFIG_SPL_NAND_BASE=y
CONFIG_SPL_NAND_ECC=y
CONFIG_SPL_NAND_SIMPLE=y
CONFIG_SYS_NS16550=y
diff --git a/configs/twister_defconfig b/configs/twister_defconfig
index 4937469..34bd769 100644
--- a/configs/twister_defconfig
+++ b/configs/twister_defconfig
@@ -36,7 +36,9 @@ CONFIG_MMC_OMAP_HS=y
CONFIG_NAND=y
CONFIG_SYS_NAND_BUSWIDTH_16BIT=y
CONFIG_SPL_NAND_DRIVERS=y
+CONFIG_SPL_NAND_BASE=y
CONFIG_SPL_NAND_ECC=y
+CONFIG_SPL_NAND_SOFTECC=y
CONFIG_SPL_NAND_SIMPLE=y
CONFIG_NETDEVICES=y
CONFIG_SMC911X=y
diff --git a/configs/wb45n_defconfig b/configs/wb45n_defconfig
index cff1d8c..910a33b 100644
--- a/configs/wb45n_defconfig
+++ b/configs/wb45n_defconfig
@@ -27,5 +27,6 @@ CONFIG_ENV_IS_IN_NAND=y
CONFIG_NAND=y
CONFIG_NAND_ATMEL=y
CONFIG_SPL_NAND_DRIVERS=y
+CONFIG_SPL_NAND_BASE=y
CONFIG_LZMA=y
CONFIG_OF_LIBFDT=y
diff --git a/configs/wb50n_defconfig b/configs/wb50n_defconfig
index 1a8cde8..1afa15d 100644
--- a/configs/wb50n_defconfig
+++ b/configs/wb50n_defconfig
@@ -26,6 +26,7 @@ CONFIG_ENV_IS_IN_NAND=y
CONFIG_NAND=y
CONFIG_NAND_ATMEL=y
CONFIG_SPL_NAND_DRIVERS=y
+CONFIG_SPL_NAND_BASE=y
CONFIG_PHYLIB=y
CONFIG_PHY_MICREL=y
CONFIG_PHY_MICREL_KSZ90X1=y
diff --git a/configs/work_92105_defconfig b/configs/work_92105_defconfig
index 3a30ed9..1d2d101 100644
--- a/configs/work_92105_defconfig
+++ b/configs/work_92105_defconfig
@@ -36,6 +36,7 @@ CONFIG_DM_GPIO=y
# CONFIG_MMC is not set
CONFIG_NAND=y
CONFIG_SPL_NAND_DRIVERS=y
+CONFIG_SPL_NAND_BASE=y
CONFIG_PHYLIB=y
CONFIG_DM_SERIAL=y
CONFIG_SYS_NS16550=y
diff --git a/drivers/mtd/nand/Kconfig b/drivers/mtd/nand/Kconfig
index 9c51ddc..4424244 100644
--- a/drivers/mtd/nand/Kconfig
+++ b/drivers/mtd/nand/Kconfig
@@ -254,11 +254,33 @@ config SPL_NAND_DRIVERS
help
SPL uses normal NAND drivers, not minimal drivers.
+config SPL_NAND_BASE
+ bool "Enable NAND base in SPL"
+ depends on SPL_NAND_DRIVERS
+ help
+ Include nand_base.c in the SPL.
+
+config SPL_NAND_LOAD
+ bool "Enable nand_spl_load"
+ help
+ This is usually only needed with some Davinci devices.
+
config SPL_NAND_ECC
bool "Enable SPL NAND ECC"
help
Include standard software ECC in the SPL
+config SPL_NAND_SOFTECC
+ bool "Use Soft ECC in SPL"
+ help
+ Use this option when a HW ECC isn't available
+
+config SPL_NAND_RAW_ONLY
+ bool "Only boot raw u-boot.bin images"
+ help
+ Support to boot only raw u-boot.bin images. Use this only
+ if you need to save space.
+
config SPL_NAND_SIMPLE
bool "Use simple SPL NAND driver"
depends on !SPL_NAND_AM33XX_BCH
diff --git a/include/configs/am3517_crane.h b/include/configs/am3517_crane.h
index d3e157a..852bc4d 100644
--- a/include/configs/am3517_crane.h
+++ b/include/configs/am3517_crane.h
@@ -239,8 +239,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 07686a2..91e7a55 100644
--- a/include/configs/am3517_evm.h
+++ b/include/configs/am3517_evm.h
@@ -227,6 +227,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 8e576d8..d7d9747 100644
--- a/include/configs/at91sam9m10g45ek.h
+++ b/include/configs/at91sam9m10g45ek.h
@@ -123,8 +123,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
#define CONFIG_SYS_NAND_5_ADDR_CYCLE
diff --git a/include/configs/at91sam9n12ek.h b/include/configs/at91sam9n12ek.h
index dfaef8f..f4629be 100644
--- a/include/configs/at91sam9n12ek.h
+++ b/include/configs/at91sam9n12ek.h
@@ -179,9 +179,6 @@
#elif CONFIG_SPI_BOOT
#define CONFIG_SPL_SPI_LOAD
#define CONFIG_SYS_SPI_U_BOOT_OFFS 0x8400
-
-#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 04ca0e4..89a89f27 100644
--- a/include/configs/at91sam9x5ek.h
+++ b/include/configs/at91sam9x5ek.h
@@ -152,9 +152,6 @@
#elif CONFIG_SPI_BOOT
#define CONFIG_SPL_SPI_LOAD
#define CONFIG_SYS_SPI_U_BOOT_OFFS 0x8400
-
-#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 810939e..9f96c8a 100644
--- a/include/configs/brppt1.h
+++ b/include/configs/brppt1.h
@@ -71,7 +71,6 @@
#endif /* CONFIG_SPL_OS_BOOT */
#ifdef CONFIG_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_NAND */
diff --git a/include/configs/cm_t35.h b/include/configs/cm_t35.h
index 35faa26..7e3d607 100644
--- a/include/configs/cm_t35.h
+++ b/include/configs/cm_t35.h
@@ -224,8 +224,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/corvus.h b/include/configs/corvus.h
index 49bcaf2..8cd62bb 100644
--- a/include/configs/corvus.h
+++ b/include/configs/corvus.h
@@ -122,9 +122,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
#define CONFIG_SYS_NAND_U_BOOT_SIZE 0x80000
#define CONFIG_SYS_NAND_U_BOOT_START CONFIG_SYS_TEXT_BASE
diff --git a/include/configs/da850evm.h b/include/configs/da850evm.h
index 355d05d..7cef14d 100644
--- a/include/configs/da850evm.h
+++ b/include/configs/da850evm.h
@@ -204,8 +204,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/devkit3250.h b/include/configs/devkit3250.h
index 5fce3ff..ab5417b 100644
--- a/include/configs/devkit3250.h
+++ b/include/configs/devkit3250.h
@@ -177,9 +177,6 @@
/* SPL will use serial */
/* SPL loads an image from NAND */
-#define CONFIG_SPL_NAND_RAW_ONLY
-
-#define CONFIG_SPL_NAND_SOFTECC
#define CONFIG_SPL_MAX_SIZE 0x20000
#define CONFIG_SPL_PAD_TO CONFIG_SPL_MAX_SIZE
diff --git a/include/configs/ipam390.h b/include/configs/ipam390.h
index b60b6c3..a5a3fe9 100644
--- a/include/configs/ipam390.h
+++ b/include/configs/ipam390.h
@@ -168,8 +168,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
/*
* Network & Ethernet Configuration
diff --git a/include/configs/mcx.h b/include/configs/mcx.h
index 96985f5..3459ca1 100644
--- a/include/configs/mcx.h
+++ b/include/configs/mcx.h
@@ -259,8 +259,6 @@
/* Defines for SPL */
-#define CONFIG_SPL_NAND_BASE
-
#define CONFIG_SPL_TEXT_BASE 0x40200000 /*CONFIG_SYS_SRAM_START*/
#define CONFIG_SPL_MAX_SIZE (54 * 1024) /* 8 KB for stack */
#define CONFIG_SPL_STACK LOW_LEVEL_SRAM_STACK
@@ -287,7 +285,6 @@
#define CONFIG_SYS_NAND_ECCSIZE 256
#define CONFIG_SYS_NAND_ECCBYTES 3
#define CONFIG_NAND_OMAP_ECCSCHEME OMAP_ECC_HAM1_CODE_SW
-#define CONFIG_SPL_NAND_SOFTECC
#define CONFIG_SYS_NAND_U_BOOT_START CONFIG_SYS_TEXT_BASE
diff --git a/include/configs/omapl138_lcdk.h b/include/configs/omapl138_lcdk.h
index ca4e71a..07f86e1 100644
--- a/include/configs/omapl138_lcdk.h
+++ b/include/configs/omapl138_lcdk.h
@@ -184,8 +184,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
#ifdef CONFIG_SYS_USE_NOR
diff --git a/include/configs/sama5d3_xplained.h
b/include/configs/sama5d3_xplained.h
index d91e75f..fdb71f6 100644
--- a/include/configs/sama5d3_xplained.h
+++ b/include/configs/sama5d3_xplained.h
@@ -80,9 +80,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 d5e158c..14f5364 100644
--- a/include/configs/sama5d3xek.h
+++ b/include/configs/sama5d3xek.h
@@ -104,9 +104,6 @@
#elif CONFIG_SPI_BOOT
#define CONFIG_SPL_SPI_LOAD
#define CONFIG_SYS_SPI_U_BOOT_OFFS 0x10000
-
-#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 4f7d70e..b64f87a 100644
--- a/include/configs/sama5d4_xplained.h
+++ b/include/configs/sama5d4_xplained.h
@@ -63,9 +63,6 @@
#elif CONFIG_SPI_BOOT
#define CONFIG_SPL_SPI_LOAD
#define CONFIG_SYS_SPI_U_BOOT_OFFS 0x10000
-
-#elif CONFIG_NAND_BOOT
-#define CONFIG_SPL_NAND_BASE
#endif
#define CONFIG_PMECC_CAP 8
#define CONFIG_PMECC_SECTOR_SIZE 512
diff --git a/include/configs/sama5d4ek.h b/include/configs/sama5d4ek.h
index 712e64b..d64e7fc 100644
--- a/include/configs/sama5d4ek.h
+++ b/include/configs/sama5d4ek.h
@@ -60,9 +60,6 @@
#elif CONFIG_SPI_BOOT
#define CONFIG_SPL_SPI_LOAD
#define CONFIG_SYS_SPI_U_BOOT_OFFS 0x10000
-
-#elif CONFIG_NAND_BOOT
-#define CONFIG_SPL_NAND_BASE
#endif
#define CONFIG_PMECC_CAP 8
#define CONFIG_PMECC_SECTOR_SIZE 512
diff --git a/include/configs/siemens-am33x-common.h
b/include/configs/siemens-am33x-common.h
index 4703fb9..32ba972 100644
--- a/include/configs/siemens-am33x-common.h
+++ b/include/configs/siemens-am33x-common.h
@@ -114,7 +114,6 @@
#define CONFIG_SPL_SPI_LOAD
#define CONFIG_SYS_SPI_U_BOOT_OFFS 0x20000
-#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 6d82182..7d5e067 100644
--- a/include/configs/smartweb.h
+++ b/include/configs/smartweb.h
@@ -205,9 +205,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
#define CONFIG_SYS_NAND_U_BOOT_SIZE SZ_512K
#define CONFIG_SYS_NAND_U_BOOT_START CONFIG_SYS_TEXT_BASE
diff --git a/include/configs/tam3517-common.h b/include/configs/tam3517-common.h
index 36453bc..71b0034 100644
--- a/include/configs/tam3517-common.h
+++ b/include/configs/tam3517-common.h
@@ -152,11 +152,8 @@
/* Defines for SPL */
#define CONFIG_SPL_CONSOLE
-#define CONFIG_SPL_NAND_SOFTECC
#define CONFIG_SPL_NAND_WORKSPACE 0x8f07f000 /* below BSS */
-#define CONFIG_SPL_NAND_BASE
-
#define CONFIG_SPL_TEXT_BASE 0x40200000 /*CONFIG_SYS_SRAM_START*/
#define CONFIG_SPL_MAX_SIZE (SRAM_SCRATCH_SPACE_ADDR - \
CONFIG_SPL_TEXT_BASE)
diff --git a/include/configs/tao3530.h b/include/configs/tao3530.h
index dc732f1..bb66526 100644
--- a/include/configs/tao3530.h
+++ b/include/configs/tao3530.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/taurus.h b/include/configs/taurus.h
index f0e8414..f8735a3 100644
--- a/include/configs/taurus.h
+++ b/include/configs/taurus.h
@@ -164,9 +164,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
#define CONFIG_SYS_NAND_U_BOOT_SIZE SZ_512K
#define CONFIG_SYS_NAND_U_BOOT_START CONFIG_SYS_TEXT_BASE
diff --git a/include/configs/ti_armv7_common.h
b/include/configs/ti_armv7_common.h
index e0f67c7..db1d0aa 100644
--- a/include/configs/ti_armv7_common.h
+++ b/include/configs/ti_armv7_common.h
@@ -202,7 +202,6 @@
/* General parts of the framework, required. */
#ifdef CONFIG_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 257e95c..b6cf498 100644
--- a/include/configs/tricorder.h
+++ b/include/configs/tricorder.h
@@ -231,7 +231,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 d2c754e..e62271c 100644
--- a/include/configs/wb45n.h
+++ b/include/configs/wb45n.h
@@ -144,7 +144,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 f031d23..2ddb5f9 100644
--- a/include/configs/wb50n.h
+++ b/include/configs/wb50n.h
@@ -122,7 +122,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 a7e7d4f..ded503d 100644
--- a/include/configs/work_92105.h
+++ b/include/configs/work_92105.h
@@ -156,7 +156,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_SPL_NAND_BOOT
#define CONFIG_SYS_NAND_U_BOOT_OFFS 0x00040000
#define CONFIG_SPL_PAD_TO 0x20000
diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt
index 468f445..b55d76a 100644
--- a/scripts/config_whitelist.txt
+++ b/scripts/config_whitelist.txt
@@ -2058,13 +2058,9 @@ CONFIG_SPL_MMC_LOAD
CONFIG_SPL_MMC_MINIMAL
CONFIG_SPL_MPC83XX_WAIT_FOR_NAND
CONFIG_SPL_MXS_PSWITCH_WAIT
-CONFIG_SPL_NAND_BASE
CONFIG_SPL_NAND_BOOT
CONFIG_SPL_NAND_INIT
-CONFIG_SPL_NAND_LOAD
CONFIG_SPL_NAND_MINIMAL
-CONFIG_SPL_NAND_RAW_ONLY
-CONFIG_SPL_NAND_SOFTECC
CONFIG_SPL_NAND_WORKSPACE
CONFIG_SPL_NO_CPU_SUPPORT_CODE
CONFIG_SPL_PAD_TO
--
2.7.4
_______________________________________________
U-Boot mailing list
U-Boot@lists.denx.de
https://lists.denx.de/listinfo/u-boot
