Convert CONFIG_CMD_SPL_NAND_OFS to Kconfig

This converts the following to Kconfig:
   CONFIG_CMD_SPL_NAND_OFS

Signed-off-by: Simon Glass <sjg@chromium.org>
Reviewed-by: Bin Meng <bmeng.cn@gmail.com>
Reviewed-by: Philipp Tomsich <philipp.tomsich@theobroma-systems.com>

diff --git a/cmd/Kconfig b/cmd/Kconfig
index 1ca91fcc3848e32dd36b895a269e451229ceb1d2..4f7336aeb01ee7f6c5c6f0c954819530fdda2d0d 100644 (file)
--- a/cmd/Kconfig
+++ b/cmd/Kconfig
@@ -285,6 +285,16 @@ config CMD_SPL
          doc/README.falcon for full information about how to use this
          command.
 
+config CMD_SPL_NAND_OFS
+       hex "Offset of OS command line args for Falcon-mode NAND boot"
+       depends on CMD_SPL
+       default 0
+       help
+         This provides the offset of the command line arguments for Linux
+         when booting from NAND in Falcon mode.  See doc/README.falcon
+         for full information about how to use this option (and also see
+         board/gateworks/gw_ventana/README for an example).
+
 endmenu
 
 menu "Environment commands"

diff --git a/configs/am335x_evm_defconfig b/configs/am335x_evm_defconfig
index 8c842c755ecc992946e0729a9a6bd65e38bf1d18..6dcb58f05e83ef1f6f6035292170e4685aa02efc 100644 (file)
--- a/configs/am335x_evm_defconfig
+++ b/configs/am335x_evm_defconfig
@@ -21,6 +21,7 @@ CONFIG_FASTBOOT_BUF_ADDR=0x81000000
 CONFIG_FASTBOOT_BUF_SIZE=0x07000000
 # CONFIG_CMD_IMLS is not set
 CONFIG_CMD_SPL=y
+CONFIG_CMD_SPL_NAND_OFS=0x00080000
 # CONFIG_CMD_FLASH is not set
 CONFIG_CMD_NAND=y
 # CONFIG_CMD_SETEXPR is not set

diff --git a/configs/am335x_evm_nor_defconfig b/configs/am335x_evm_nor_defconfig
index 061ac7388c2ec6fb4201647942e93946f9761570..411d35c73a353fa854fca19ab377239144b00db9 100644 (file)
--- a/configs/am335x_evm_nor_defconfig
+++ b/configs/am335x_evm_nor_defconfig
@@ -21,6 +21,7 @@ CONFIG_FASTBOOT_BUF_SIZE=0x07000000
 # CONFIG_CMD_IMLS is not set
 CONFIG_CMD_SPL=y
 CONFIG_CMD_NAND=y
+CONFIG_CMD_SPL_NAND_OFS=0x00080000
 # CONFIG_CMD_SETEXPR is not set
 CONFIG_CMD_MTDPARTS=y
 CONFIG_DFU_MMC=y

diff --git a/configs/am335x_evm_usbspl_defconfig b/configs/am335x_evm_usbspl_defconfig
index afb620489961deba019849f561e1f9284408d6dc..34a6975d5a75b05093c0c12739b3fad1ea28494d 100644 (file)
--- a/configs/am335x_evm_usbspl_defconfig
+++ b/configs/am335x_evm_usbspl_defconfig
@@ -23,6 +23,7 @@ CONFIG_FASTBOOT_BUF_ADDR=0x81000000
 CONFIG_FASTBOOT_BUF_SIZE=0x07000000
 # CONFIG_CMD_IMLS is not set
 CONFIG_CMD_SPL=y
+CONFIG_CMD_SPL_NAND_OFS=0x00080000
 # CONFIG_CMD_FLASH is not set
 CONFIG_CMD_NAND=y
 # CONFIG_CMD_SETEXPR is not set

diff --git a/configs/am43xx_evm_defconfig b/configs/am43xx_evm_defconfig
index 1a8736787dd674b93143fb49988bc8547c950af3..a66d8070c0f233f15171c8d07e776fcebf689737 100644 (file)
--- a/configs/am43xx_evm_defconfig
+++ b/configs/am43xx_evm_defconfig
@@ -16,6 +16,7 @@ CONFIG_SPL_OS_BOOT=y
 CONFIG_HUSH_PARSER=y
 # CONFIG_CMD_IMLS is not set
 CONFIG_CMD_SPL=y
+CONFIG_CMD_SPL_NAND_OFS=0x00100000
 # CONFIG_CMD_FLASH is not set
 CONFIG_CMD_NAND=y
 # CONFIG_CMD_SETEXPR is not set

diff --git a/configs/am43xx_evm_ethboot_defconfig b/configs/am43xx_evm_ethboot_defconfig
index a53466ce5bff44fadddbee88bec5fdfac8c7a341..5679f31c2c6f1b7864592c0fcad46b4b2e117964 100644 (file)
--- a/configs/am43xx_evm_ethboot_defconfig
+++ b/configs/am43xx_evm_ethboot_defconfig
@@ -16,6 +16,7 @@ CONFIG_HUSH_PARSER=y
 CONFIG_CMD_BOOTZ=y
 # CONFIG_CMD_IMLS is not set
 CONFIG_CMD_SPL=y
+CONFIG_CMD_SPL_NAND_OFS=0x00100000
 CONFIG_CMD_ASKENV=y
 CONFIG_CMD_EEPROM=y
 # CONFIG_CMD_FLASH is not set

diff --git a/configs/am43xx_evm_usbhost_boot_defconfig b/configs/am43xx_evm_usbhost_boot_defconfig
index 99c1f9e954b6b1ce9515e87d193f056c84cc68bd..549ec0a020200ad28a01c905132a310520d97c5d 100644 (file)
--- a/configs/am43xx_evm_usbhost_boot_defconfig
+++ b/configs/am43xx_evm_usbhost_boot_defconfig
@@ -20,6 +20,7 @@ CONFIG_HUSH_PARSER=y
 CONFIG_CMD_BOOTZ=y
 # CONFIG_CMD_IMLS is not set
 CONFIG_CMD_SPL=y
+CONFIG_CMD_SPL_NAND_OFS=0x00100000
 CONFIG_CMD_ASKENV=y
 CONFIG_CMD_EEPROM=y
 # CONFIG_CMD_FLASH is not set

diff --git a/configs/cairo_defconfig b/configs/cairo_defconfig
index 3122287b9ad6a6b3e88d822f96061f9dec43bc31..3045b83e2f713a3800ee4fa71aec76b4d6b53e96 100644 (file)
--- a/configs/cairo_defconfig
+++ b/configs/cairo_defconfig
@@ -15,6 +15,7 @@ CONFIG_CMD_BOOTZ=y
 # CONFIG_CMD_IMI is not set
 # CONFIG_CMD_IMLS is not set
 CONFIG_CMD_SPL=y
+CONFIG_CMD_SPL_NAND_OFS=0x240000
 CONFIG_CMD_ASKENV=y
 # CONFIG_CMD_FLASH is not set
 CONFIG_CMD_MMC=y

diff --git a/configs/devkit8000_defconfig b/configs/devkit8000_defconfig
index 71a382d89cf6b72bc7c17de4ab41baa32b413e5f..875c8881f9a412b4489d61115127204d90c156c9 100644 (file)
--- a/configs/devkit8000_defconfig
+++ b/configs/devkit8000_defconfig
@@ -11,6 +11,7 @@ CONFIG_HUSH_PARSER=y
 # CONFIG_CMD_IMI is not set
 # CONFIG_CMD_IMLS is not set
 CONFIG_CMD_SPL=y
+CONFIG_CMD_SPL_NAND_OFS=0x680000
 # CONFIG_CMD_FLASH is not set
 CONFIG_CMD_MMC=y
 CONFIG_CMD_NAND=y

diff --git a/configs/gwventana_emmc_defconfig b/configs/gwventana_emmc_defconfig
index 316df3e97f007c2e7cf8de29598519244c1f9662..3318faee0f7e67557e06506ac09ae14dd6655bfa 100644 (file)
--- a/configs/gwventana_emmc_defconfig
+++ b/configs/gwventana_emmc_defconfig
@@ -32,6 +32,7 @@ CONFIG_HUSH_PARSER=y
 CONFIG_SYS_PROMPT="Ventana > "
 CONFIG_CMD_BOOTZ=y
 # CONFIG_CMD_IMLS is not set
+CONFIG_CMD_SPL_NAND_OFS=0x1100000
 # CONFIG_CMD_FLASH is not set
 CONFIG_CMD_MMC=y
 CONFIG_CMD_I2C=y

diff --git a/configs/gwventana_gw5904_defconfig b/configs/gwventana_gw5904_defconfig
index d04a92b83afa3f01bd8f5bb9d900bb0cf7eaec38..7830d90ca21240009983706dbec72863b49ba3df 100644 (file)
--- a/configs/gwventana_gw5904_defconfig
+++ b/configs/gwventana_gw5904_defconfig
@@ -32,6 +32,7 @@ CONFIG_HUSH_PARSER=y
 CONFIG_SYS_PROMPT="Ventana > "
 CONFIG_CMD_BOOTZ=y
 # CONFIG_CMD_IMLS is not set
+CONFIG_CMD_SPL_NAND_OFS=0x1100000
 # CONFIG_CMD_FLASH is not set
 CONFIG_CMD_MMC=y
 CONFIG_CMD_I2C=y

diff --git a/configs/gwventana_nand_defconfig b/configs/gwventana_nand_defconfig
index 02b4d2bec3a4f46ad3e4488ff1724ec1309a49d2..3b0f42d377345faf18618c54442e8eb9183ed255 100644 (file)
--- a/configs/gwventana_nand_defconfig
+++ b/configs/gwventana_nand_defconfig
@@ -33,6 +33,7 @@ CONFIG_HUSH_PARSER=y
 CONFIG_SYS_PROMPT="Ventana > "
 CONFIG_CMD_BOOTZ=y
 # CONFIG_CMD_IMLS is not set
+CONFIG_CMD_SPL_NAND_OFS=0x1100000
 # CONFIG_CMD_FLASH is not set
 CONFIG_CMD_MMC=y
 CONFIG_CMD_NAND=y

diff --git a/configs/igep0020_defconfig b/configs/igep0020_defconfig
index 2375f861f12efdeeae5a08a3d2c1fe32cf1650e4..576674cc334141f770498ba7f3179bca6af626c1 100644 (file)
--- a/configs/igep0020_defconfig
+++ b/configs/igep0020_defconfig
@@ -16,6 +16,7 @@ CONFIG_SPL_MTD_SUPPORT=y
 CONFIG_SPL_ONENAND_SUPPORT=y
 CONFIG_SPL_OS_BOOT=y
 # CONFIG_CMD_IMLS is not set
+CONFIG_CMD_SPL=y
 CONFIG_CMD_ASKENV=y
 # CONFIG_CMD_FLASH is not set
 CONFIG_CMD_MMC=y

diff --git a/configs/igep0030_defconfig b/configs/igep0030_defconfig
index 03da20162bae5ffb4f8df4b3fcf236c4fcfd9c2a..b80db9a876740ccd57c798db2ccc08806cf25d64 100644 (file)
--- a/configs/igep0030_defconfig
+++ b/configs/igep0030_defconfig
@@ -16,6 +16,7 @@ CONFIG_SPL_MTD_SUPPORT=y
 CONFIG_SPL_ONENAND_SUPPORT=y
 CONFIG_SPL_OS_BOOT=y
 # CONFIG_CMD_IMLS is not set
+CONFIG_CMD_SPL=y
 CONFIG_CMD_ASKENV=y
 # CONFIG_CMD_FLASH is not set
 CONFIG_CMD_MMC=y

diff --git a/configs/igep0032_defconfig b/configs/igep0032_defconfig
index fb8c9251132fc1a48017c4338032039d624b952b..237bc43f5dba92f521c7178cf33943110a89306c 100644 (file)
--- a/configs/igep0032_defconfig
+++ b/configs/igep0032_defconfig
@@ -15,6 +15,7 @@ CONFIG_SPL_MTD_SUPPORT=y
 CONFIG_SPL_ONENAND_SUPPORT=y
 CONFIG_SPL_OS_BOOT=y
 # CONFIG_CMD_IMLS is not set
+CONFIG_CMD_SPL=y
 CONFIG_CMD_ASKENV=y
 # CONFIG_CMD_FLASH is not set
 CONFIG_CMD_MMC=y

diff --git a/configs/ipam390_defconfig b/configs/ipam390_defconfig
index c97256d0ffe133204325e189ae1fe615c1237dce..702b3115682b0919f24489db067a4ecde1d39c8b 100644 (file)
--- a/configs/ipam390_defconfig
+++ b/configs/ipam390_defconfig
@@ -18,6 +18,7 @@ CONFIG_HUSH_PARSER=y
 CONFIG_SYS_PROMPT="U-Boot > "
 # CONFIG_CMD_IMLS is not set
 CONFIG_CMD_SPL=y
+CONFIG_CMD_SPL_NAND_OFS=0x00180000
 CONFIG_CMD_ASKENV=y
 CONFIG_CRC32_VERIFY=y
 # CONFIG_CMD_FLASH is not set

diff --git a/configs/omap3_beagle_defconfig b/configs/omap3_beagle_defconfig
index 7cb5662bd444fd751cababc6371f5d00ac0c5c3e..b3c447f834cd6ef360ba33b3db961071b2500f25 100644 (file)
--- a/configs/omap3_beagle_defconfig
+++ b/configs/omap3_beagle_defconfig
@@ -12,6 +12,7 @@ CONFIG_SPL_MTD_SUPPORT=y
 CONFIG_SPL_OS_BOOT=y
 # CONFIG_CMD_IMLS is not set
 CONFIG_CMD_SPL=y
+CONFIG_CMD_SPL_NAND_OFS=0x240000
 CONFIG_CMD_ASKENV=y
 # CONFIG_CMD_FLASH is not set
 CONFIG_CMD_MMC=y

diff --git a/configs/omap3_logic_defconfig b/configs/omap3_logic_defconfig
index d1eb9419fbc4d3fe139bdd9f260578d4e2f1e624..27c9e21bd53fcf98ce780b522b77928cfe25544d 100644 (file)
--- a/configs/omap3_logic_defconfig
+++ b/configs/omap3_logic_defconfig
@@ -20,6 +20,7 @@ CONFIG_SYS_PROMPT="OMAP Logic # "
 # CONFIG_CMD_IMI is not set
 # CONFIG_CMD_IMLS is not set
 CONFIG_CMD_SPL=y
+CONFIG_CMD_SPL_NAND_OFS=0x240000
 # CONFIG_CMD_EEPROM is not set
 # CONFIG_CMD_FLASH is not set
 CONFIG_CMD_NAND=y

diff --git a/configs/omap3_overo_defconfig b/configs/omap3_overo_defconfig
index 12dab49318f2bc51a7e8367a52f4a14e62aee830..18bb6a124db4c2b015b18f2f7f4a91b29f53508c 100644 (file)
--- a/configs/omap3_overo_defconfig
+++ b/configs/omap3_overo_defconfig
@@ -17,6 +17,7 @@ CONFIG_CMD_BOOTZ=y
 # CONFIG_CMD_IMI is not set
 # CONFIG_CMD_IMLS is not set
 CONFIG_CMD_SPL=y
+CONFIG_CMD_SPL_NAND_OFS=0x240000
 CONFIG_CMD_ASKENV=y
 # CONFIG_CMD_FLASH is not set
 CONFIG_CMD_MMC=y

diff --git a/configs/pengwyn_defconfig b/configs/pengwyn_defconfig
index 545958a7900957406fc1bcf7714f7968768daa21..3db9eb08b04d1e20695b283ed1205a64e7be1600 100644 (file)
--- a/configs/pengwyn_defconfig
+++ b/configs/pengwyn_defconfig
@@ -30,6 +30,7 @@ CONFIG_HUSH_PARSER=y
 CONFIG_CMD_BOOTZ=y
 # CONFIG_CMD_IMLS is not set
 CONFIG_CMD_SPL=y
+CONFIG_CMD_SPL_NAND_OFS=0x240000
 CONFIG_CMD_ASKENV=y
 CONFIG_CMD_EEPROM=y
 # CONFIG_CMD_FLASH is not set

diff --git a/configs/twister_defconfig b/configs/twister_defconfig
index 46dbdd5c9436be0b45e533f98f7a7c2e4f37452b..130806047b3eb5f33e06ec775b763d96d88f0ae5 100644 (file)
--- a/configs/twister_defconfig
+++ b/configs/twister_defconfig
@@ -12,6 +12,7 @@ CONFIG_HUSH_PARSER=y
 CONFIG_SYS_PROMPT="twister => "
 # CONFIG_CMD_IMLS is not set
 CONFIG_CMD_SPL=y
+CONFIG_CMD_SPL_NAND_OFS=0x00800000
 CONFIG_CMD_EEPROM=y
 # CONFIG_CMD_FLASH is not set
 CONFIG_CMD_MMC=y

diff --git a/include/configs/am335x_evm.h b/include/configs/am335x_evm.h
index fbab610d7a7f07a84cf9664aacf414670a8f7458..e11527fcff661d22399e9ea11c62efaa1777048c 100644 (file)
--- a/include/configs/am335x_evm.h
+++ b/include/configs/am335x_evm.h
@@ -238,7 +238,6 @@
 #define CONFIG_SPL_NAND_AM33XX_BCH
 #endif
 #ifdef CONFIG_SPL_OS_BOOT
-#define CONFIG_CMD_SPL_NAND_OFS        0x00080000 /* os parameters */
 #define CONFIG_SYS_NAND_SPL_KERNEL_OFFS        0x00200000 /* kernel offset */
 #define CONFIG_CMD_SPL_WRITE_SIZE      0x2000
 #endif

diff --git a/include/configs/am43xx_evm.h b/include/configs/am43xx_evm.h
index 4f3b605a968ae4be9174ea13ef9aa494161a2f40..7a811a0a2b6d86c959842b475c50aced8275084b 100644 (file)
--- a/include/configs/am43xx_evm.h
+++ b/include/configs/am43xx_evm.h
@@ -307,7 +307,6 @@
 #endif
 /* NAND: SPL falcon mode configs */
 #ifdef CONFIG_SPL_OS_BOOT
-#define CONFIG_CMD_SPL_NAND_OFS                0x00100000 /* os parameters */
 #define CONFIG_SYS_NAND_SPL_KERNEL_OFFS        0x00300000 /* kernel offset */
 #define CONFIG_CMD_SPL_WRITE_SIZE      CONFIG_SYS_NAND_BLOCK_SIZE
 #endif

diff --git a/include/configs/baltos.h b/include/configs/baltos.h
index 598352b3ce797702e10c02139d79bd267f3d4a49..d5413fd071dd064b1b812326f60001fe29431b64 100644 (file)
--- a/include/configs/baltos.h
+++ b/include/configs/baltos.h
@@ -45,7 +45,6 @@
 #ifdef CONFIG_NAND
 #define CONFIG_SYS_NAND_U_BOOT_OFFS    0x00080000
 #ifdef CONFIG_SPL_OS_BOOT
-#define CONFIG_CMD_SPL_NAND_OFS 0x00080000 /* os parameters */
 #define CONFIG_SYS_NAND_SPL_KERNEL_OFFS 0x00200000 /* kernel offset */
 #define CONFIG_CMD_SPL_WRITE_SIZE      0x2000
 #endif

diff --git a/include/configs/bav335x.h b/include/configs/bav335x.h
index 6beb347a8b89d29149c33e9d92f177076644949f..8acc771e3aff6477b1074ad7209ee99b1118bd1e 100644 (file)
--- a/include/configs/bav335x.h
+++ b/include/configs/bav335x.h
@@ -395,7 +395,6 @@ DEFAULT_LINUX_BOOT_ENV \
 #define CONFIG_SPL_NAND_AM33XX_BCH
 #endif
 #ifdef CONFIG_SPL_OS_BOOT
-#define CONFIG_CMD_SPL_NAND_OFS        0x00080000 /* os parameters */
 #define CONFIG_SYS_NAND_SPL_KERNEL_OFFS        0x00200000 /* kernel offset */
 #define CONFIG_CMD_SPL_WRITE_SIZE      0x2000
 #endif

diff --git a/include/configs/brppt1.h b/include/configs/brppt1.h
index 9688c4a7768bf1ef5d20bbfc7bcbe35364b52228..3dbbf67b5c6691d785735d1d58a53147a3afb433 100644 (file)
--- a/include/configs/brppt1.h
+++ b/include/configs/brppt1.h
@@ -66,7 +66,6 @@
 
 /* NAND */
 #ifdef CONFIG_NAND
-#define CONFIG_CMD_SPL_NAND_OFS                        0x080000 /* end of u-boot */
 #define CONFIG_SYS_NAND_SPL_KERNEL_OFFS                0x140000
 #define CONFIG_CMD_SPL_WRITE_SIZE              0x2000
 #endif /* CONFIG_NAND */

diff --git a/include/configs/cm_t335.h b/include/configs/cm_t335.h
index f01783b8fdfe3403d62082e845a19181f3cf6881..1874cd38e8ec947a51ab19c71804efa8770447f4 100644 (file)
--- a/include/configs/cm_t335.h
+++ b/include/configs/cm_t335.h
@@ -137,7 +137,6 @@
 #define CONFIG_SYS_ENV_SECT_SIZE       (128 << 10)     /* 128 KiB */
 #define CONFIG_SYS_NAND_ONFI_DETECTION
 #ifdef CONFIG_SPL_OS_BOOT
-#define CONFIG_CMD_SPL_NAND_OFS                0x400000 /* un-assigned: (using dtb) */
 #define CONFIG_SYS_NAND_SPL_KERNEL_OFFS        0x500000
 #define CONFIG_CMD_SPL_WRITE_SIZE      0x2000
 #endif

diff --git a/include/configs/devkit8000.h b/include/configs/devkit8000.h
index 5b249d1f67f8b4fd9c68e1d7886286ea17c05ffa..30c165cd7748b3dcc2e63e0545dce6e05e064db0 100644 (file)
--- a/include/configs/devkit8000.h
+++ b/include/configs/devkit8000.h
@@ -210,8 +210,6 @@
 
 /* SPL OS boot options */
 #define CONFIG_CMD_SPL_WRITE_SIZE       0x400 /* 1024 byte */
-#define CONFIG_CMD_SPL_NAND_OFS (CONFIG_SYS_NAND_SPL_KERNEL_OFFS+\
-                                       0x400000)
 #define CONFIG_SYS_NAND_SPL_KERNEL_OFFS 0x280000
 
 #undef CONFIG_SYS_MMCSD_RAW_MODE_KERNEL_SECTOR

diff --git a/include/configs/dra7xx_evm.h b/include/configs/dra7xx_evm.h
index 1a58c6ef24f27563b4287cb319c4f87eddc26b77..9316a1227882f7931375272963afdf05a5953eea 100644 (file)
--- a/include/configs/dra7xx_evm.h
+++ b/include/configs/dra7xx_evm.h
@@ -209,7 +209,6 @@
 #endif
 /* NAND: SPL falcon mode configs */
 #ifdef CONFIG_SPL_OS_BOOT
-#define CONFIG_CMD_SPL_NAND_OFS                0x00080000 /* os-boot params*/
 #define CONFIG_SYS_NAND_SPL_KERNEL_OFFS        0x00200000 /* kernel offset */
 #define CONFIG_CMD_SPL_WRITE_SIZE      0x2000
 #endif

diff --git a/include/configs/gw_ventana.h b/include/configs/gw_ventana.h
index 0c395e5480ee8f6e7945862e05cb09ece19da05d..d389058573baff7b1456ae2ebdae736f70494ae2 100644 (file)
--- a/include/configs/gw_ventana.h
+++ b/include/configs/gw_ventana.h
@@ -16,7 +16,6 @@
 #define CONFIG_CMD_SPL_WRITE_SIZE      (128 * SZ_1K)
 
 /* Falcon Mode - NAND support: args@17MB kernel@18MB */
-#define CONFIG_CMD_SPL_NAND_OFS                (17 * SZ_1M)
 #define CONFIG_SYS_NAND_SPL_KERNEL_OFFS        (18 * SZ_1M)
 
 /* Falcon Mode - MMC support: args@1MB kernel@2MB */

diff --git a/include/configs/ipam390.h b/include/configs/ipam390.h
index 4824941dc3b2bbc2fb023769a91cc345960b58cc..6adbb8e778925e01ef0eb68a0b0802a7fc11cb60 100644 (file)
--- a/include/configs/ipam390.h
+++ b/include/configs/ipam390.h
@@ -276,7 +276,6 @@
 /* add FALCON boot mode */
 #define CONFIG_SYS_NAND_SPL_KERNEL_OFFS        0x00200000
 #define CONFIG_SYS_SPL_ARGS_ADDR       LINUX_BOOT_PARAM_ADDR
-#define CONFIG_CMD_SPL_NAND_OFS                0x00180000
 #define CONFIG_CMD_SPL_WRITE_SIZE      0x400
 
 /* GPIO support */

diff --git a/include/configs/omap3_beagle.h b/include/configs/omap3_beagle.h
index a87a75e3cc0cb67648c934342933c6e6f433653c..c6839013f271b9d5715576beaf7dfa4c5ac01b22 100644 (file)
--- a/include/configs/omap3_beagle.h
+++ b/include/configs/omap3_beagle.h
@@ -276,7 +276,6 @@
 #define CONFIG_SYS_NAND_U_BOOT_OFFS    0x80000
 /* NAND: SPL falcon mode configs */
 #ifdef CONFIG_SPL_OS_BOOT
-#define CONFIG_CMD_SPL_NAND_OFS                0x240000
 #define CONFIG_SYS_NAND_SPL_KERNEL_OFFS        0x280000
 #define CONFIG_CMD_SPL_WRITE_SIZE      0x2000
 #endif

diff --git a/include/configs/omap3_cairo.h b/include/configs/omap3_cairo.h
index 4f8ce541448c8eb6378d9ddfc4d12fb4ebc03c76..5f9f8156fd6bea38364326954e15dc64beab2bac 100644 (file)
--- a/include/configs/omap3_cairo.h
+++ b/include/configs/omap3_cairo.h
@@ -200,7 +200,6 @@
 #define CONFIG_SYS_NAND_U_BOOT_OFFS    0x80000
 /* NAND: SPL falcon mode configs */
 #ifdef CONFIG_SPL_OS_BOOT
-#define CONFIG_CMD_SPL_NAND_OFS                0x240000
 #define CONFIG_SYS_NAND_SPL_KERNEL_OFFS        0x280000
 #define CONFIG_CMD_SPL_WRITE_SIZE      0x2000
 #endif

diff --git a/include/configs/omap3_logic.h b/include/configs/omap3_logic.h
index e5ffb8538113670587a9e09f7d0f5c71278368ce..795538bc8839acd5c56714376f8ff025c66f3093 100644 (file)
--- a/include/configs/omap3_logic.h
+++ b/include/configs/omap3_logic.h
@@ -263,7 +263,6 @@
 
 /* NAND: SPL falcon mode configs */
 #ifdef CONFIG_SPL_OS_BOOT
-#define CONFIG_CMD_SPL_NAND_OFS                0x240000
 #define CONFIG_SYS_NAND_SPL_KERNEL_OFFS        0x280000
 #define CONFIG_CMD_SPL_WRITE_SIZE      0x2000
 #endif

diff --git a/include/configs/omap3_overo.h b/include/configs/omap3_overo.h
index bc4a59e1289822211aec43159b05bb091e9f833a..bfcf7900026afbfe924532e90bd7ff51845098e9 100644 (file)
--- a/include/configs/omap3_overo.h
+++ b/include/configs/omap3_overo.h
@@ -217,7 +217,6 @@
 #define CONFIG_SYS_NAND_U_BOOT_OFFS    0x80000
 /* NAND: SPL falcon mode configs */
 #ifdef CONFIG_SPL_OS_BOOT
-#define CONFIG_CMD_SPL_NAND_OFS                0x240000
 #define CONFIG_SYS_NAND_SPL_KERNEL_OFFS        0x280000
 #define CONFIG_CMD_SPL_WRITE_SIZE      0x2000
 #endif

diff --git a/include/configs/omap3_zoom1.h b/include/configs/omap3_zoom1.h
index 7f4f56f1716355e877a90aa9e98053c48f5d4c04..d3c72f30b274fe73640c6f394e1ca9f1341121dd 100644 (file)
--- a/include/configs/omap3_zoom1.h
+++ b/include/configs/omap3_zoom1.h
@@ -57,7 +57,6 @@
 #if defined(CONFIG_CMD_NAND)
 /* NAND: SPL falcon mode configs */
 #ifdef CONFIG_SPL_OS_BOOT
-#define CONFIG_CMD_SPL_NAND_OFS                0x240000
 #define CONFIG_SYS_NAND_SPL_KERNEL_OFFS        0x280000
 #define CONFIG_CMD_SPL_WRITE_SIZE      0x2000
 #endif

diff --git a/include/configs/pengwyn.h b/include/configs/pengwyn.h
index a76bbce9ff3ceb4f01d03950a45f81cf3ed0ac2c..1c611677b7901329c98455dea29fc437b2561294 100644 (file)
--- a/include/configs/pengwyn.h
+++ b/include/configs/pengwyn.h
@@ -163,7 +163,6 @@
 #define CONFIG_SYS_ENV_SECT_SIZE       (128 << 10)     /* 128 KiB */
 /* NAND: SPL falcon mode configs */
 #ifdef CONFIG_SPL_OS_BOOT
-#define CONFIG_CMD_SPL_NAND_OFS                0x240000 /* un-assigned */
 #define CONFIG_SYS_NAND_SPL_KERNEL_OFFS        0x280000
 #define CONFIG_CMD_SPL_WRITE_SIZE      0x2000
 #endif

diff --git a/include/configs/twister.h b/include/configs/twister.h
index c45ae87a41449743fce2a00644fb3fdffabd635e..80d480b103475b063da17ad725ca8bd03ac2fa2b 100644 (file)
--- a/include/configs/twister.h
+++ b/include/configs/twister.h
@@ -38,8 +38,6 @@
 /* SPL OS boot options */
 #define CONFIG_CMD_SPL_WRITE_SIZE      0x400 /* 1024 byte */
 #define CONFIG_SYS_NAND_SPL_KERNEL_OFFS        0x00200000
-#define CONFIG_CMD_SPL_NAND_OFS        (CONFIG_SYS_NAND_SPL_KERNEL_OFFS+\
-                                               0x600000)
 
 #define CONFIG_SYS_SPL_ARGS_ADDR       (PHYS_SDRAM_1 + 0x100)
 

diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt
index 663c7adfa7c7162a50a07341a80de95a12729b69..e570f0ffe478ac75ae293e447649bed78a5d2f16 100644 (file)
--- a/scripts/config_whitelist.txt
+++ b/scripts/config_whitelist.txt
@@ -293,7 +293,6 @@ CONFIG_CM922T_XA10
 CONFIG_CMDLINE_EDITING
 CONFIG_CMDLINE_PS_SUPPORT
 CONFIG_CMDLINE_TAG
-CONFIG_CMD_SPL_NAND_OFS
 CONFIG_CMD_SPL_WRITE_SIZE
 CONFIG_CMD_STRINGS
 CONFIG_CMD_SX151X