]> git.dujemihanovic.xyz Git - u-boot.git/commitdiff
Convert CONFIG_SPL_NAND_BASE et al to Kconfig
authorAdam Ford <aford173@gmail.com>
Fri, 3 Jul 2020 13:09:45 +0000 (08:09 -0500)
committerTom Rini <trini@konsulko.com>
Tue, 28 Jul 2020 20:18:10 +0000 (16:18 -0400)
This converts the following to Kconfig:
   CONFIG_SPL_NAND_BASE
   CONFIG_SPL_NAND_IDENT

Signed-off-by: Adam Ford <aford173@gmail.com>
85 files changed:
README
common/spl/Kconfig
configs/am335x_baltos_defconfig
configs/am335x_evm_defconfig
configs/am335x_guardian_defconfig
configs/am335x_hs_evm_defconfig
configs/am335x_hs_evm_uart_defconfig
configs/am335x_igep003x_defconfig
configs/am335x_sl50_defconfig
configs/am3517_crane_defconfig
configs/am3517_evm_defconfig
configs/am43xx_evm_defconfig
configs/am43xx_evm_rtconly_defconfig
configs/am43xx_evm_usbhost_boot_defconfig
configs/am43xx_hs_evm_defconfig
configs/axm_defconfig
configs/brppt1_nand_defconfig
configs/chiliboard_defconfig
configs/cm_t335_defconfig
configs/cm_t43_defconfig
configs/corvus_defconfig
configs/da850evm_nand_defconfig
configs/devkit8000_defconfig
configs/dra7xx_evm_defconfig
configs/dra7xx_hs_evm_defconfig
configs/draco_defconfig
configs/etamin_defconfig
configs/gardena-smart-gateway-at91sam_defconfig
configs/igep00x0_defconfig
configs/k2e_evm_defconfig
configs/k2g_evm_defconfig
configs/k2hk_evm_defconfig
configs/k2l_evm_defconfig
configs/omap35_logic_defconfig
configs/omap35_logic_somlv_defconfig
configs/omap3_beagle_defconfig
configs/omap3_evm_defconfig
configs/omap3_ha_defconfig
configs/omap3_logic_defconfig
configs/omap3_logic_somlv_defconfig
configs/omapl138_lcdk_defconfig
configs/phycore-am335x-r2-wega_defconfig
configs/pxm2_defconfig
configs/rastaban_defconfig
configs/rut_defconfig
configs/sama5d3_xplained_nandflash_defconfig
configs/sama5d3xek_nandflash_defconfig
configs/sama5d4_xplained_nandflash_defconfig
configs/sama5d4ek_nandflash_defconfig
configs/smartweb_defconfig
configs/tao3530_defconfig
configs/taurus_defconfig
configs/thuban_defconfig
configs/ti816x_evm_defconfig
configs/tricorder_defconfig
configs/tricorder_flash_defconfig
configs/wb45n_defconfig
configs/wb50n_defconfig
configs/work_92105_defconfig
include/configs/am3517_crane.h
include/configs/am3517_evm.h
include/configs/at91sam9m10g45ek.h
include/configs/at91sam9n12ek.h
include/configs/at91sam9x5ek.h
include/configs/brppt1.h
include/configs/corvus.h
include/configs/da850evm.h
include/configs/gardena-smart-gateway-at91sam.h
include/configs/omapl138_lcdk.h
include/configs/pm9g45.h
include/configs/sama5d3_xplained.h
include/configs/sama5d3xek.h
include/configs/sama5d4_xplained.h
include/configs/sama5d4ek.h
include/configs/siemens-am33x-common.h
include/configs/smartweb.h
include/configs/tam3517-common.h
include/configs/tao3530.h
include/configs/taurus.h
include/configs/ti_armv7_common.h
include/configs/tricorder.h
include/configs/wb45n.h
include/configs/wb50n.h
include/configs/work_92105.h
scripts/config_whitelist.txt

diff --git a/README b/README
index afb65597d9d4ab904d4878435f5d3d7de679f529..78f20e901f614eaf5d0f7d842a382068186f5507 100644 (file)
--- 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.
index 1a5cf13d9db8ae1e94f80e67b9a03066b409ba6b..dcc1a95139fa260aeb3b96eb58b0acf713298c6e 100644 (file)
@@ -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
index 40d9e003d0d1581d6db0e252ac3bc00a5a644499..9245a922d451b534d444366ac50e74e75f09a0ac 100644 (file)
@@ -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
index ea9f1dfef7c3c621818c25db2d96f78b08ceaea4..57bd6be226190509034ed78729e6639dbdf4921e 100644 (file)
@@ -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
index 2b28cce409a06d8caa6df9929c4ef36feb415ff8..c98bb61a5fc59746845d417aa06b220047f38b5d 100644 (file)
@@ -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
index 3a88a6bd01c9139affcbe524ec0d54d84ba75901..f97ecac084c61038d0c1d4f9b17cd9e1224d1d21 100644 (file)
@@ -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
index f52cc9676e3160073104a8284fcd93dbfa13e863..339a995af396f57d130d37db59a6d3e9688d5914 100644 (file)
@@ -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
index 8bf23a601c9eac37e426cdc88786e792f144a78f..f624bb410bc4df5f8fad4f17b54cfef75bdc2fb6 100644 (file)
@@ -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
index f15b5ccbeab92be79ff32b6d95a25ddb732ec390..6a9555a32ae036f6cb6c4574d5bbfdf53951f13e 100644 (file)
@@ -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
index 4155df51bdafeb94e777ecdd900a25489aed5213..44f6c064dd9e623893f5a825d72917b5dfd039aa 100644 (file)
@@ -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 # "
index 7a798f738efbe7e2d7af993e74f474ed50746a2f..f235978f305d5fd6f82b57c08e2d4b46407ec7e9 100644 (file)
@@ -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 # "
index 33a3df1368f47d7d697016251a4f433ca1525c5d..61637c6e00c0f4e2cbf8d31ced7efd1eea223489 100644 (file)
@@ -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
index 1c40d51c728c800762a79c704b78975592b55789..a82c542bf5f03b1579936b6db788176304adfd9b 100644 (file)
@@ -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
index 7f05a1ac6ff9d5712e8f19364ab1db52481169c4..bcc6324c549b463d888d2d368f4270724a1b10ac 100644 (file)
@@ -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
index e85e4764682a899b4332516c8a165d638781903b..a913a32dee3f0b9536788d263e2f7fd70fd8edcf 100644 (file)
@@ -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
index 837e72969fe80a83c8d63546a763e39794730aca..0a3ddf90b18d196aa849b5eb7c212c1e8df667ea 100644 (file)
@@ -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
index fff41036b5fd32a3d7f6556dad7d3d1e850b0197..afe20315ae067d056450fb2e3240600f9c6c0a9f 100644 (file)
@@ -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
index 1b08e750909fd7ca25b60d722001aa3dd8f95f3e..9c3fe8e13407a0e1a8858b3456b9ee498004250f 100644 (file)
@@ -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
index 85d2114e4346c06ef6fca1e70fa937f76b608809..92538a4a9b65511960c5c65f1d34b087f5fac73e 100644 (file)
@@ -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
index 1679b741ad7c1611e7f36e4dcf6eeccdc562209e..0d9afce7a90f50c96a97e27cd7bea8c97c52d193 100644 (file)
@@ -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 # "
index d97cb111f79b3cb7b52a29172bd26dc722497046..a8ed2b76b09562817afa8bd3d70bbab428efa9a7 100644 (file)
@@ -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
index d6c14b0a8f8bb8497fad4fa944bcf5c6e5acd9be..e86f67d564557e4cffa49a83508119804ae55984 100644 (file)
@@ -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
index 4eae268fed3cc02eea146290e2e723b3633eef7c..593e9ca8eb1caedd49f5e9881e3a3f86a54d8cc3 100644 (file)
@@ -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
index 568b8a76322cc745b5f056eed811ca227e8466e7..7a8736b248be1f24021d2851a7130d8be3b0cf31 100644 (file)
@@ -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
index 60cb5b934c09e7349b5b6915d218cffe0808c73b..2121adf11a096efbbc3a3b6f2d0ba507a0f7097c 100644 (file)
@@ -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
index 57db3621710f46abbd4302dcf4aff95597c8bcca..bbc13d9b2ea9949001117e511007cc4e93d0c6d8 100644 (file)
@@ -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
index 249b9ba74a842c15eba110e15129fd6982e74c13..213379299d6362e4bf0f5de29c07311a4c664cb5 100644 (file)
@@ -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
index 6344e5fb5291b08da6972c061051a6ff5dfa42c6..425feb635d2999f2dca7c2a4c2a42abd9a690fa4 100644 (file)
@@ -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
index 1bc36cab80172d84b8e55e96a355d4bef303c982..3a3f0d0a5d5ca3e265db5bc0e3932b3d8f98fb89 100644 (file)
@@ -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
index 070b58bd6e989d301f78c5adcf36cc4e4ed627bd..54a26e853ba0133f8ad4384c109b8413d08532ec 100644 (file)
@@ -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
index bd8ff01d0e37d91cd48f99ed557fceeab52b8915..116b6266611f0c5cf8243c790eb841cdd297d849 100644 (file)
@@ -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
index bdfccbcad72f0ee1d1f22ac76beec217ba38b3da..c4b8e36d2f190435f415cef5780feda2d8b6793f 100644 (file)
@@ -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
index 22c31359f8507f2c6608ff36cc295f9161b016ae..84268cd0be93925157d09a60c7b99d5fafcd3452 100644 (file)
@@ -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
index 30d11f0f8b3a8cd3441ffe0e302a131d1ddabe82..d9d799b575a29a2243a8e0c4a374989445af0ea1 100644 (file)
@@ -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
index d4ad44fb7b8bdb6d63b13171c9e8fbc794b16e87..d3505469afabadd8487006c71b5c4fa6b9767dc6 100644 (file)
@@ -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 # "
index 1f40d81613e161466e1ef1457590d2ed5776696b..020e58d3eda093ce9ff8c2f8ed7724f026832957 100644 (file)
@@ -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
index 3c0d5fe51711cb538a38f90cb196e4c202e3d28b..cf65c12447864f23cc4b5aae69b1cbef9b9d6f66 100644 (file)
@@ -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
index ce5a44fddc2a918565f3c5613777404f84c4ccdb..66967871a83cc6523b9f7c16236b3ab27a85f00e 100644 (file)
@@ -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
index 4ca486a7f3184498ccae803f4e1eecce63f523d2..755d86d6a0eb6a1cfd4db3b1f4419b9ac4dfd8f9 100644 (file)
@@ -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
index 96edbe25023618dc7a2468a6c51a3e43a487441d..af2cc3477fc27afd1b7e60cf1dff37139fa83a00 100644 (file)
@@ -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 # "
index 1b4e30beb707d1377189fa164fcb44d13fffcb36..45194aa5d56141d209b89880d2362dd4a568e9f1 100644 (file)
@@ -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
index dae5a088c0df05d8cdded31b2c958acbaea0de19..692568b3133e49e32946644f19387a6c332d0ac6 100644 (file)
@@ -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
index 690eb6bed6724ed13a23c21239c58779fd785223..b2e89bb903b1c3aae475fb635ed7907b43c556c7 100644 (file)
@@ -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
index 4ceefca06561b7fc237aaf21d59baf4b2c36ffaa..ae3fb0465e9ab0188163ca2c792093901c2b0881 100644 (file)
@@ -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
index ad78db3e9ef8559dba85d83ed2b66e0bdf19b196..dd11fca50683e2ac149bd55808c52c79af20e2bd 100644 (file)
@@ -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
index d8c07f721514967b1c44b94bb1e075a9edc9e457..5e67e5c08ddaf4b2df655d900271ec530d6a6c76 100644 (file)
@@ -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
index eba49c668fd7b4740ecefdf283aac170bb30423c..2106a909c5633c956763030fc3414a5579ae40b9 100644 (file)
@@ -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
index c28492dc60fcc0e2949a47e0cc75c57aee1b0cd9..addf44592c666b8a044b63453cea4dc1c1fed58c 100644 (file)
@@ -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
index 6faff4d6662c6ef39fc1d01f583e230d8e8d7b80..2c12fb9db0afeda166afab76af093b4f2d71b04e 100644 (file)
@@ -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
index 7bdd8f091d2ed850efaa6c5a85cf294380125ba7..96a8a723b36159ba0c14408958e0821691facf53 100644 (file)
@@ -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
index 4f57b0f2807dd122fa4499e049f357e3ea3ea9be..d87b3550694502c145ac5c1e1f32116c59668274 100644 (file)
@@ -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
index fa0fb41cb33256083a35989b4fe5ad14f90058fb..f5fd14cb908aa5764059097df7d1e4a8de32c7db 100644 (file)
@@ -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"
index 8402408355e93d4cafca76b7e3dc7d1e099fca34..fa0220665101185b2aae10f2916df6174c29894f 100644 (file)
@@ -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
index e436175fb37e755aa8de5dd98c5a42262194eaf9..26172a7bdb6ac319aa85d3c4e32968674a021bcd 100644 (file)
@@ -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
index 34f8dc9edea24dff6dcf4a7cd2fe8d1cb5566d06..49613801cca4501f2590c568b04ace514aa976d1 100644 (file)
@@ -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
index 022e951b53a308635a0ad7ae845727b4d770cdfe..43970093d11654beab4dda7b53f78d0f8aaeaf54 100644 (file)
@@ -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
index 398b5c36b9709787755eecd400da85eb3eeed902..01adf93d057e7a8ff2184b261c24ee0a4260f8be 100644 (file)
@@ -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
index b89bf110839a5ef051f572cc8eb9c081a34cbb37..4bee60fe751a06c14a79cc9e5160682a84e57631 100644 (file)
@@ -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
index e884cf7cd3830ee3960c524723408f9330cfdce7..10694f4028985bfe77e73c0ebe50d88b0f8e05ce 100644 (file)
@@ -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
index f4cae8a2c5ba2bb714174a247da69b2ddfb726e5..e331cce908adafa087e0bd881f4b00c56baf4bc0 100644 (file)
 #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
index 89b95d635e59635771b1ac1fc27976a3c5879693..fc7d399e2e144e3a180ea3f603a714a4da415396 100644 (file)
 #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 */
index 3ecb89b731c54c17a5fa545267c64841cc5b260a..e20cb5e332730a8555aaacb6d4a36bcff5f0b346 100644 (file)
 #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
index ae0ae9b08d1836e7075aba3b9df984a7c1de68a6..7fb8aa3246b46f6b3b83dd388dca32050f13e780 100644 (file)
 #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
index f1ab1e61865981c6bbfb68f044b4420ede552e39..1889450f3ff5c051c236b93d653c7c3ac85493fe 100644 (file)
 #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
index d0054bc96843b396dc3d5c5a21568b2c37957c0f..729d4d9799baa5c26d48dd6cae0620414c5b7081 100644 (file)
@@ -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 */
index def7fe571c93f4915e0081811235920924ff6a50..55f77e4400a2efdbeed9a133e04b1b945a3c49cc 100644 (file)
 #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
index d428b02704d3ecc8cf804ab81cbeb811244ebafe..506caffeee30361e63bd186d166521c69764becd 100644 (file)
 #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
index d0149f8609a9ac65cd2a7e64652fe0df166f07c3..007cbb043a38d10aacfe892b85d0956fafa8c8f5 100644 (file)
@@ -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
index a62033e86c83b53f8419c47aff53537539855168..4404fef7763974442559413c067760ac68333be8 100644 (file)
 #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
 
index 6e0376619f3a495267f4d049b107a57f907dbfaa..47274a51506aab24fb3ffa1159813ee8b3d38029 100644 (file)
@@ -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
index 7f774461b586d2f808b2e28943633e5faf9bc369..65156c947f40563d328e7faa45a146c42627a113 100644 (file)
@@ -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
index 8d511b1f08a50689e75bd41a8c814632d389196b..4185826e37e88d6a5f08db67705ac3d547973776 100644 (file)
@@ -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
index 2171a5f6a62272b82a319d424ba13826c607bdf3..d00be5a44573f9d71a1ecca797c363112cb6eb22 100644 (file)
@@ -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
index 6a8026345efce5358f65f47c0931d712068aa8b9..33718d4eac8b88760abee5b23b655d81f0fff9f2 100644 (file)
@@ -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
index 8a7f6e56652259d7a9e4071852f34441dfba422d..c4ee1219b3710cdf4e432621afd1671fa7b452f7 100644 (file)
@@ -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 / \
index fb84c8f8c0dd83671fef8269d08fa14a187703ca..6e715dc0c1bec1b46d83b9d83270b40e17f0edee 100644 (file)
 
 #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
index d2f5d9ed00108f4a2ec02d389bd93d9e61882c49..a98f9440530c51c2d0cffe3e1238dfe5d8756651 100644 (file)
 #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
index 11ed793083e613eed303e82e492e9b9a9c95dc69..5a461c50b94cf7a632cd1de5229a89e8a7e3066a 100644 (file)
 #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
index 9c69a04b9eec605a96bf3f2716ca2ec2a08fbfba..39eae8e2ba0454bbc0b62cc5f9eb7e1dbf358fd4 100644 (file)
 
 #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
index 22c983bdeea34a908f08914d86d2e3eebd4d7250..4769a398c532eb85e839355c2d2821eeeeab5fe9 100644 (file)
 /* 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 */
index aaf0acfbe992a8f2a6ef9c08f48fb1077839df28..e7d57bb90082c9cd3545b98b552dec2300adf414 100644 (file)
 
 /* 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
 
index 0533cf13d7004997a84feca333e15ced4b1aeb26..cc7a688580ea7414bba9deab6530abeb41539ebb 100644 (file)
 #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
index 8090df0e30441dbcf4ae158fb0ee1f3bcc08be88..b1f3b8452cbff100a15e7f1edcf605747233890d 100644 (file)
@@ -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
index 4788142f5f7d0989724ed134e168fd2d2625b6c8..7874b77f3f88b12facc043529007724eed3dc19c 100644 (file)
 /* 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 */
index 8d0738eb9d0cc3741900fe955eacb806b099757c..90d6554f841ff1cfc70d9a23e5c3527fefb0f43a 100644 (file)
@@ -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