[U-Boot] [PATCH 25/41] 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 ---

cmd/Kconfig | 10 ++++++++++ configs/am335x_boneblack_defconfig | 1 + configs/am335x_boneblack_vboot_defconfig | 1 + configs/am335x_evm_defconfig | 1 + configs/am335x_evm_nor_defconfig | 1 + configs/am335x_evm_usbspl_defconfig | 1 + configs/am335x_igep003x_defconfig | 1 + configs/am335x_shc_defconfig | 1 + configs/am335x_shc_ict_defconfig | 1 + configs/am335x_shc_netboot_defconfig | 1 + configs/am335x_shc_prompt_defconfig | 1 + configs/am335x_shc_sdboot_defconfig | 1 + configs/am335x_shc_sdboot_prompt_defconfig | 1 + configs/am335x_sl50_defconfig | 1 + configs/am43xx_evm_defconfig | 1 + configs/am43xx_evm_ethboot_defconfig | 1 + configs/am43xx_evm_usbhost_boot_defconfig | 1 + configs/am57xx_evm_defconfig | 1 + configs/am57xx_evm_nodt_defconfig | 1 + configs/birdland_bav335a_defconfig | 1 + configs/birdland_bav335b_defconfig | 1 + configs/cairo_defconfig | 1 + configs/devkit8000_defconfig | 1 + configs/dra7xx_evm_defconfig | 1 + configs/gwventana_emmc_defconfig | 1 + configs/gwventana_gw5904_defconfig | 1 + configs/gwventana_nand_defconfig | 1 + configs/igep0020_defconfig | 1 + configs/igep0030_defconfig | 1 + configs/igep0032_defconfig | 1 + configs/ipam390_defconfig | 1 + configs/microblaze-generic_defconfig | 1 + configs/mx6sabresd_defconfig | 1 + configs/omap3_beagle_defconfig | 1 + configs/omap3_logic_defconfig | 1 + configs/omap3_overo_defconfig | 1 + configs/omap4_panda_defconfig | 1 + configs/omap5_uevm_defconfig | 1 + configs/pcm051_rev1_defconfig | 1 + configs/pcm051_rev3_defconfig | 1 + configs/pengwyn_defconfig | 1 + configs/topic_miami_defconfig | 1 + configs/topic_miamilite_defconfig | 1 + configs/topic_miamiplus_defconfig | 1 + configs/twister_defconfig | 1 + configs/zynq_microzed_defconfig | 1 + configs/zynq_picozed_defconfig | 1 + configs/zynq_zc702_defconfig | 1 + configs/zynq_zc706_defconfig | 1 + configs/zynq_zc770_xm010_defconfig | 1 + configs/zynq_zc770_xm011_defconfig | 1 + configs/zynq_zc770_xm012_defconfig | 1 + configs/zynq_zc770_xm013_defconfig | 1 + configs/zynq_zed_defconfig | 1 + configs/zynq_zybo_defconfig | 1 + include/configs/am335x_evm.h | 1 - include/configs/am43xx_evm.h | 1 - include/configs/baltos.h | 1 - include/configs/bav335x.h | 1 - include/configs/brppt1.h | 1 - include/configs/cm_t335.h | 1 - include/configs/devkit8000.h | 2 -- include/configs/dra7xx_evm.h | 1 - include/configs/gw_ventana.h | 1 - include/configs/ipam390.h | 1 - include/configs/omap3_beagle.h | 1 - include/configs/omap3_cairo.h | 1 - include/configs/omap3_logic.h | 1 - include/configs/omap3_overo.h | 1 - include/configs/omap3_zoom1.h | 1 - include/configs/pengwyn.h | 1 - include/configs/twister.h | 2 -- scripts/config_whitelist.txt | 1 - 73 files changed, 64 insertions(+), 20 deletions(-)

diff --git a/cmd/Kconfig b/cmd/Kconfig index 0cc5d56d7f..c5c9b8c5e5 100644 --- a/cmd/Kconfig +++ b/cmd/Kconfig @@ -279,6 +279,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_boneblack_defconfig b/configs/am335x_boneblack_defconfig index 195b24f7f7..a251a0defc 100644 --- a/configs/am335x_boneblack_defconfig +++ b/configs/am335x_boneblack_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=0x0 # CONFIG_CMD_FLASH is not set # CONFIG_CMD_SETEXPR is not set CONFIG_DFU_TFTP=y diff --git a/configs/am335x_boneblack_vboot_defconfig b/configs/am335x_boneblack_vboot_defconfig index e7890fc8b5..a964169d3c 100644 --- a/configs/am335x_boneblack_vboot_defconfig +++ b/configs/am335x_boneblack_vboot_defconfig @@ -26,6 +26,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=0x0 # CONFIG_CMD_FLASH is not set # CONFIG_CMD_SETEXPR is not set CONFIG_OF_CONTROL=y diff --git a/configs/am335x_evm_defconfig b/configs/am335x_evm_defconfig index 2e5bb103a5..83716dfc3b 100644 --- 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_SETEXPR is not set CONFIG_CMD_MTDPARTS=y diff --git a/configs/am335x_evm_nor_defconfig b/configs/am335x_evm_nor_defconfig index c70cd6d247..36ad9d1c0c 100644 --- a/configs/am335x_evm_nor_defconfig +++ b/configs/am335x_evm_nor_defconfig @@ -20,6 +20,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_ASKENV=y CONFIG_CMD_EEPROM=y CONFIG_CMD_GPT=y diff --git a/configs/am335x_evm_usbspl_defconfig b/configs/am335x_evm_usbspl_defconfig index 49f732b81e..63aa238a56 100644 --- 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_SETEXPR is not set CONFIG_CMD_MTDPARTS=y diff --git a/configs/am335x_igep003x_defconfig b/configs/am335x_igep003x_defconfig index cef7c315cf..4b9b67b059 100644 --- a/configs/am335x_igep003x_defconfig +++ b/configs/am335x_igep003x_defconfig @@ -29,6 +29,7 @@ CONFIG_HUSH_PARSER=y CONFIG_CMD_BOOTZ=y # CONFIG_CMD_IMLS is not set CONFIG_CMD_SPL=y +CONFIG_CMD_SPL_NAND_OFS=0x0 CONFIG_CMD_ASKENV=y # CONFIG_CMD_FLASH is not set CONFIG_CMD_MMC=y diff --git a/configs/am335x_shc_defconfig b/configs/am335x_shc_defconfig index 4bd1b65880..14329b0913 100644 --- a/configs/am335x_shc_defconfig +++ b/configs/am335x_shc_defconfig @@ -28,6 +28,7 @@ CONFIG_AUTOBOOT_PROMPT="Enter 'shc' to enter prompt (times out) %d \nEnter 'noau CONFIG_AUTOBOOT_DELAY_STR="shc" CONFIG_AUTOBOOT_STOP_STR="noautoboot" # CONFIG_CMD_IMLS is not set +CONFIG_CMD_SPL_NAND_OFS=0x0 # CONFIG_CMD_FLASH is not set CONFIG_CMD_GPT=y CONFIG_CMD_MMC=y diff --git a/configs/am335x_shc_ict_defconfig b/configs/am335x_shc_ict_defconfig index 1025cd1d5c..88de993bc0 100644 --- a/configs/am335x_shc_ict_defconfig +++ b/configs/am335x_shc_ict_defconfig @@ -28,6 +28,7 @@ CONFIG_AUTOBOOT_PROMPT="Enter 'shc' to enter prompt (times out) %d \nEnter 'noau CONFIG_AUTOBOOT_DELAY_STR="shc" CONFIG_AUTOBOOT_STOP_STR="noautoboot" # CONFIG_CMD_IMLS is not set +CONFIG_CMD_SPL_NAND_OFS=0x0 # CONFIG_CMD_FLASH is not set CONFIG_CMD_GPT=y CONFIG_CMD_MMC=y diff --git a/configs/am335x_shc_netboot_defconfig b/configs/am335x_shc_netboot_defconfig index 0011234d55..26d3bc99a9 100644 --- a/configs/am335x_shc_netboot_defconfig +++ b/configs/am335x_shc_netboot_defconfig @@ -29,6 +29,7 @@ CONFIG_AUTOBOOT_PROMPT="Enter 'shc' to enter prompt (times out) %d \nEnter 'noau CONFIG_AUTOBOOT_DELAY_STR="shc" CONFIG_AUTOBOOT_STOP_STR="noautoboot" # CONFIG_CMD_IMLS is not set +CONFIG_CMD_SPL_NAND_OFS=0x0 # CONFIG_CMD_FLASH is not set CONFIG_CMD_GPT=y CONFIG_CMD_MMC=y diff --git a/configs/am335x_shc_prompt_defconfig b/configs/am335x_shc_prompt_defconfig index a6c617f87e..58593b2a51 100644 --- a/configs/am335x_shc_prompt_defconfig +++ b/configs/am335x_shc_prompt_defconfig @@ -26,6 +26,7 @@ CONFIG_AUTOBOOT_PROMPT="Enter 'shc' to enter prompt (times out) %d \nEnter 'noau CONFIG_AUTOBOOT_DELAY_STR="shc" CONFIG_AUTOBOOT_STOP_STR="noautoboot" # CONFIG_CMD_IMLS is not set +CONFIG_CMD_SPL_NAND_OFS=0x0 # CONFIG_CMD_FLASH is not set CONFIG_CMD_GPT=y CONFIG_CMD_MMC=y diff --git a/configs/am335x_shc_sdboot_defconfig b/configs/am335x_shc_sdboot_defconfig index fa231543a2..c2a50d4ed6 100644 --- a/configs/am335x_shc_sdboot_defconfig +++ b/configs/am335x_shc_sdboot_defconfig @@ -28,6 +28,7 @@ CONFIG_AUTOBOOT_PROMPT="Enter 'shc' to enter prompt (times out) %d \nEnter 'noau CONFIG_AUTOBOOT_DELAY_STR="shc" CONFIG_AUTOBOOT_STOP_STR="noautoboot" # CONFIG_CMD_IMLS is not set +CONFIG_CMD_SPL_NAND_OFS=0x0 # CONFIG_CMD_FLASH is not set CONFIG_CMD_GPT=y CONFIG_CMD_MMC=y diff --git a/configs/am335x_shc_sdboot_prompt_defconfig b/configs/am335x_shc_sdboot_prompt_defconfig index fa231543a2..c2a50d4ed6 100644 --- a/configs/am335x_shc_sdboot_prompt_defconfig +++ b/configs/am335x_shc_sdboot_prompt_defconfig @@ -28,6 +28,7 @@ CONFIG_AUTOBOOT_PROMPT="Enter 'shc' to enter prompt (times out) %d \nEnter 'noau CONFIG_AUTOBOOT_DELAY_STR="shc" CONFIG_AUTOBOOT_STOP_STR="noautoboot" # CONFIG_CMD_IMLS is not set +CONFIG_CMD_SPL_NAND_OFS=0x0 # CONFIG_CMD_FLASH is not set CONFIG_CMD_GPT=y CONFIG_CMD_MMC=y diff --git a/configs/am335x_sl50_defconfig b/configs/am335x_sl50_defconfig index 10e1d1c870..e61cf7c11e 100644 --- a/configs/am335x_sl50_defconfig +++ b/configs/am335x_sl50_defconfig @@ -29,6 +29,7 @@ CONFIG_AUTOBOOT_DELAY_STR="d" CONFIG_AUTOBOOT_STOP_STR=" " # CONFIG_CMD_IMLS is not set CONFIG_CMD_SPL=y +CONFIG_CMD_SPL_NAND_OFS=0x0 CONFIG_CMD_ASKENV=y CONFIG_CMD_EEPROM=y # CONFIG_CMD_FLASH is not set diff --git a/configs/am43xx_evm_defconfig b/configs/am43xx_evm_defconfig index 5d707b92e3..602338a45d 100644 --- 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_SETEXPR is not set CONFIG_CMD_MTDPARTS=y diff --git a/configs/am43xx_evm_ethboot_defconfig b/configs/am43xx_evm_ethboot_defconfig index 19d596278d..320aa451bf 100644 --- a/configs/am43xx_evm_ethboot_defconfig +++ b/configs/am43xx_evm_ethboot_defconfig @@ -15,6 +15,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 fd6ff5f285..db71fc6057 100644 --- a/configs/am43xx_evm_usbhost_boot_defconfig +++ b/configs/am43xx_evm_usbhost_boot_defconfig @@ -19,6 +19,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/am57xx_evm_defconfig b/configs/am57xx_evm_defconfig index 4b1ceb820b..6dbc2ca28c 100644 --- a/configs/am57xx_evm_defconfig +++ b/configs/am57xx_evm_defconfig @@ -32,6 +32,7 @@ CONFIG_FASTBOOT_FLASH=y CONFIG_FASTBOOT_FLASH_MMC_DEV=1 # CONFIG_CMD_IMLS is not set CONFIG_CMD_SPL=y +CONFIG_CMD_SPL_NAND_OFS=0x0 # CONFIG_CMD_FLASH is not set # CONFIG_CMD_SETEXPR is not set # CONFIG_CMD_PMIC is not set diff --git a/configs/am57xx_evm_nodt_defconfig b/configs/am57xx_evm_nodt_defconfig index d8cbcda21a..206ac27a21 100644 --- a/configs/am57xx_evm_nodt_defconfig +++ b/configs/am57xx_evm_nodt_defconfig @@ -24,6 +24,7 @@ CONFIG_FASTBOOT_FLASH_MMC_DEV=1 CONFIG_CMD_BOOTZ=y # CONFIG_CMD_IMLS is not set CONFIG_CMD_SPL=y +CONFIG_CMD_SPL_NAND_OFS=0x0 CONFIG_CMD_ASKENV=y # CONFIG_CMD_FLASH is not set CONFIG_CMD_GPT=y diff --git a/configs/birdland_bav335a_defconfig b/configs/birdland_bav335a_defconfig index 18e0100a7b..0db9909337 100644 --- a/configs/birdland_bav335a_defconfig +++ b/configs/birdland_bav335a_defconfig @@ -26,6 +26,7 @@ CONFIG_HUSH_PARSER=y CONFIG_CMD_BOOTZ=y # CONFIG_CMD_IMLS is not set CONFIG_CMD_SPL=y +CONFIG_CMD_SPL_NAND_OFS=0x0 CONFIG_CMD_ASKENV=y CONFIG_CMD_EEPROM=y # CONFIG_CMD_FLASH is not set diff --git a/configs/birdland_bav335b_defconfig b/configs/birdland_bav335b_defconfig index a143142ae7..641c359e94 100644 --- a/configs/birdland_bav335b_defconfig +++ b/configs/birdland_bav335b_defconfig @@ -26,6 +26,7 @@ CONFIG_HUSH_PARSER=y CONFIG_CMD_BOOTZ=y # CONFIG_CMD_IMLS is not set CONFIG_CMD_SPL=y +CONFIG_CMD_SPL_NAND_OFS=0x0 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 a1506ff339..35578500f9 100644 --- a/configs/cairo_defconfig +++ b/configs/cairo_defconfig @@ -13,6 +13,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 17cdab7428..84f1ba381b 100644 --- a/configs/devkit8000_defconfig +++ b/configs/devkit8000_defconfig @@ -9,6 +9,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_PART=y diff --git a/configs/dra7xx_evm_defconfig b/configs/dra7xx_evm_defconfig index 4634e8e7af..166986d7f9 100644 --- a/configs/dra7xx_evm_defconfig +++ b/configs/dra7xx_evm_defconfig @@ -31,6 +31,7 @@ CONFIG_FASTBOOT_FLASH=y CONFIG_FASTBOOT_FLASH_MMC_DEV=1 # CONFIG_CMD_IMLS is not set CONFIG_CMD_SPL=y +CONFIG_CMD_SPL_NAND_OFS=0x0 # CONFIG_CMD_FLASH is not set # CONFIG_CMD_SETEXPR is not set CONFIG_ISO_PARTITION=y diff --git a/configs/gwventana_emmc_defconfig b/configs/gwventana_emmc_defconfig index 0549fc71f8..4bbe4ac049 100644 --- a/configs/gwventana_emmc_defconfig +++ b/configs/gwventana_emmc_defconfig @@ -31,6 +31,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 cd161f3a03..16120d163f 100644 --- a/configs/gwventana_gw5904_defconfig +++ b/configs/gwventana_gw5904_defconfig @@ -31,6 +31,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 5ba5f173b3..87c56c7bd5 100644 --- a/configs/gwventana_nand_defconfig +++ b/configs/gwventana_nand_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/igep0020_defconfig b/configs/igep0020_defconfig index bcd4f22b79..c8fbcd2765 100644 --- a/configs/igep0020_defconfig +++ b/configs/igep0020_defconfig @@ -16,6 +16,7 @@ CONFIG_SPL_ONENAND_SUPPORT=y CONFIG_SPL_OS_BOOT=y # CONFIG_CMD_IMLS is not set CONFIG_CMD_SPL=y +CONFIG_CMD_SPL_NAND_OFS=0x0 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 30ab21079e..59222534b0 100644 --- a/configs/igep0030_defconfig +++ b/configs/igep0030_defconfig @@ -16,6 +16,7 @@ CONFIG_SPL_ONENAND_SUPPORT=y CONFIG_SPL_OS_BOOT=y # CONFIG_CMD_IMLS is not set CONFIG_CMD_SPL=y +CONFIG_CMD_SPL_NAND_OFS=0x0 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 493bf41713..c511bc3f4f 100644 --- a/configs/igep0032_defconfig +++ b/configs/igep0032_defconfig @@ -15,6 +15,7 @@ CONFIG_SPL_ONENAND_SUPPORT=y CONFIG_SPL_OS_BOOT=y # CONFIG_CMD_IMLS is not set CONFIG_CMD_SPL=y +CONFIG_CMD_SPL_NAND_OFS=0x0 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 68bbe8667d..83009be0a8 100644 --- a/configs/ipam390_defconfig +++ b/configs/ipam390_defconfig @@ -17,6 +17,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/microblaze-generic_defconfig b/configs/microblaze-generic_defconfig index 45aaf3bbd5..0bf052f3fc 100644 --- a/configs/microblaze-generic_defconfig +++ b/configs/microblaze-generic_defconfig @@ -22,6 +22,7 @@ CONFIG_SYS_OS_BASE=0x2c060000 CONFIG_HUSH_PARSER=y CONFIG_SYS_PROMPT="U-Boot-mONStR> " CONFIG_CMD_SPL=y +CONFIG_CMD_SPL_NAND_OFS=0x0 CONFIG_CMD_ASKENV=y CONFIG_CMD_GPIO=y CONFIG_CMD_MFSL=y diff --git a/configs/mx6sabresd_defconfig b/configs/mx6sabresd_defconfig index 7bd6da1654..f16e0756f3 100644 --- a/configs/mx6sabresd_defconfig +++ b/configs/mx6sabresd_defconfig @@ -22,6 +22,7 @@ CONFIG_HUSH_PARSER=y CONFIG_CMD_BOOTZ=y # CONFIG_CMD_IMLS is not set CONFIG_CMD_SPL=y +CONFIG_CMD_SPL_NAND_OFS=0x0 # CONFIG_CMD_FLASH is not set CONFIG_CMD_MMC=y CONFIG_CMD_PART=y diff --git a/configs/omap3_beagle_defconfig b/configs/omap3_beagle_defconfig index aebacd2918..03db663f5d 100644 --- a/configs/omap3_beagle_defconfig +++ b/configs/omap3_beagle_defconfig @@ -10,6 +10,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 022a7c15c8..5e95b46367 100644 --- a/configs/omap3_logic_defconfig +++ b/configs/omap3_logic_defconfig @@ -18,6 +18,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_USB is not set diff --git a/configs/omap3_overo_defconfig b/configs/omap3_overo_defconfig index a5e2f25873..6b546dd419 100644 --- a/configs/omap3_overo_defconfig +++ b/configs/omap3_overo_defconfig @@ -16,6 +16,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/omap4_panda_defconfig b/configs/omap4_panda_defconfig index 44eaed8590..fec6b301f9 100644 --- a/configs/omap4_panda_defconfig +++ b/configs/omap4_panda_defconfig @@ -13,6 +13,7 @@ CONFIG_SPL=y CONFIG_SPL_OS_BOOT=y # CONFIG_CMD_IMLS is not set CONFIG_CMD_SPL=y +CONFIG_CMD_SPL_NAND_OFS=0x0 CONFIG_CMD_ASKENV=y # CONFIG_CMD_FLASH is not set CONFIG_CMD_MMC=y diff --git a/configs/omap5_uevm_defconfig b/configs/omap5_uevm_defconfig index 81edba49b3..338324d1f9 100644 --- a/configs/omap5_uevm_defconfig +++ b/configs/omap5_uevm_defconfig @@ -13,6 +13,7 @@ CONFIG_HUSH_PARSER=y CONFIG_CMD_BOOTZ=y # CONFIG_CMD_IMLS is not set CONFIG_CMD_SPL=y +CONFIG_CMD_SPL_NAND_OFS=0x0 CONFIG_CMD_ASKENV=y # CONFIG_CMD_FLASH is not set CONFIG_CMD_GPT=y diff --git a/configs/pcm051_rev1_defconfig b/configs/pcm051_rev1_defconfig index 8faaad9b6f..d405b27d43 100644 --- a/configs/pcm051_rev1_defconfig +++ b/configs/pcm051_rev1_defconfig @@ -28,6 +28,7 @@ CONFIG_HUSH_PARSER=y CONFIG_CMD_BOOTZ=y # CONFIG_CMD_IMLS is not set CONFIG_CMD_SPL=y +CONFIG_CMD_SPL_NAND_OFS=0x0 CONFIG_CMD_ASKENV=y CONFIG_CMD_EEPROM=y # CONFIG_CMD_FLASH is not set diff --git a/configs/pcm051_rev3_defconfig b/configs/pcm051_rev3_defconfig index b2126f0f56..1513cb6f2d 100644 --- a/configs/pcm051_rev3_defconfig +++ b/configs/pcm051_rev3_defconfig @@ -28,6 +28,7 @@ CONFIG_HUSH_PARSER=y CONFIG_CMD_BOOTZ=y # CONFIG_CMD_IMLS is not set CONFIG_CMD_SPL=y +CONFIG_CMD_SPL_NAND_OFS=0x0 CONFIG_CMD_ASKENV=y CONFIG_CMD_EEPROM=y # CONFIG_CMD_FLASH is not set diff --git a/configs/pengwyn_defconfig b/configs/pengwyn_defconfig index 0a3553f60f..41bf2563c0 100644 --- a/configs/pengwyn_defconfig +++ b/configs/pengwyn_defconfig @@ -29,6 +29,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/topic_miami_defconfig b/configs/topic_miami_defconfig index 8df2fb13ce..88c2614b2f 100644 --- a/configs/topic_miami_defconfig +++ b/configs/topic_miami_defconfig @@ -12,6 +12,7 @@ CONFIG_SPL=y CONFIG_HUSH_PARSER=y CONFIG_SYS_PROMPT="zynq-uboot> " # CONFIG_CMD_IMLS is not set +CONFIG_CMD_SPL_NAND_OFS=0x0 # CONFIG_CMD_FLASH is not set CONFIG_CMD_MMC=y CONFIG_CMD_SF=y diff --git a/configs/topic_miamilite_defconfig b/configs/topic_miamilite_defconfig index cddc084a05..8eff0ec200 100644 --- a/configs/topic_miamilite_defconfig +++ b/configs/topic_miamilite_defconfig @@ -12,6 +12,7 @@ CONFIG_SPL=y CONFIG_HUSH_PARSER=y CONFIG_SYS_PROMPT="zynq-uboot> " # CONFIG_CMD_IMLS is not set +CONFIG_CMD_SPL_NAND_OFS=0x0 # CONFIG_CMD_FLASH is not set CONFIG_CMD_MMC=y CONFIG_CMD_SF=y diff --git a/configs/topic_miamiplus_defconfig b/configs/topic_miamiplus_defconfig index 1016718797..b8c41d4355 100644 --- a/configs/topic_miamiplus_defconfig +++ b/configs/topic_miamiplus_defconfig @@ -12,6 +12,7 @@ CONFIG_SPL=y CONFIG_HUSH_PARSER=y CONFIG_SYS_PROMPT="zynq-uboot> " # CONFIG_CMD_IMLS is not set +CONFIG_CMD_SPL_NAND_OFS=0x0 # CONFIG_CMD_FLASH is not set CONFIG_CMD_MMC=y CONFIG_CMD_SF=y diff --git a/configs/twister_defconfig b/configs/twister_defconfig index 4d3157a28b..226990aebd 100644 --- a/configs/twister_defconfig +++ b/configs/twister_defconfig @@ -10,6 +10,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/configs/zynq_microzed_defconfig b/configs/zynq_microzed_defconfig index 2d7fffc1f4..f9221427e2 100644 --- a/configs/zynq_microzed_defconfig +++ b/configs/zynq_microzed_defconfig @@ -11,6 +11,7 @@ CONFIG_SPL_OS_BOOT=y CONFIG_HUSH_PARSER=y CONFIG_SYS_PROMPT="Zynq> " # CONFIG_CMD_IMLS is not set +CONFIG_CMD_SPL_NAND_OFS=0x0 # CONFIG_CMD_FLASH is not set CONFIG_CMD_MMC=y CONFIG_CMD_SF=y diff --git a/configs/zynq_picozed_defconfig b/configs/zynq_picozed_defconfig index 7ca69a973c..0419ed5b89 100644 --- a/configs/zynq_picozed_defconfig +++ b/configs/zynq_picozed_defconfig @@ -8,6 +8,7 @@ CONFIG_SPL_OS_BOOT=y CONFIG_HUSH_PARSER=y CONFIG_SYS_PROMPT="Zynq> " # CONFIG_CMD_IMLS is not set +CONFIG_CMD_SPL_NAND_OFS=0x0 # CONFIG_CMD_FLASH is not set CONFIG_CMD_MMC=y CONFIG_CMD_USB=y diff --git a/configs/zynq_zc702_defconfig b/configs/zynq_zc702_defconfig index 8f20b09244..ea1e0777c2 100644 --- a/configs/zynq_zc702_defconfig +++ b/configs/zynq_zc702_defconfig @@ -13,6 +13,7 @@ CONFIG_SPL_OS_BOOT=y CONFIG_HUSH_PARSER=y CONFIG_SYS_PROMPT="Zynq> " # CONFIG_CMD_IMLS is not set +CONFIG_CMD_SPL_NAND_OFS=0x0 CONFIG_CMD_EEPROM=y # CONFIG_CMD_FLASH is not set CONFIG_CMD_MMC=y diff --git a/configs/zynq_zc706_defconfig b/configs/zynq_zc706_defconfig index 825346abd6..29f2ce6fc6 100644 --- a/configs/zynq_zc706_defconfig +++ b/configs/zynq_zc706_defconfig @@ -12,6 +12,7 @@ CONFIG_SPL_OS_BOOT=y CONFIG_HUSH_PARSER=y CONFIG_SYS_PROMPT="Zynq> " # CONFIG_CMD_IMLS is not set +CONFIG_CMD_SPL_NAND_OFS=0x0 CONFIG_CMD_EEPROM=y # CONFIG_CMD_FLASH is not set CONFIG_CMD_MMC=y diff --git a/configs/zynq_zc770_xm010_defconfig b/configs/zynq_zc770_xm010_defconfig index a1ef49f250..12e3742e9c 100644 --- a/configs/zynq_zc770_xm010_defconfig +++ b/configs/zynq_zc770_xm010_defconfig @@ -12,6 +12,7 @@ CONFIG_SPL_OS_BOOT=y CONFIG_HUSH_PARSER=y CONFIG_SYS_PROMPT="Zynq> " # CONFIG_CMD_IMLS is not set +CONFIG_CMD_SPL_NAND_OFS=0x0 # CONFIG_CMD_FLASH is not set CONFIG_CMD_MMC=y CONFIG_CMD_SF=y diff --git a/configs/zynq_zc770_xm011_defconfig b/configs/zynq_zc770_xm011_defconfig index 148f70360b..bc676e7476 100644 --- a/configs/zynq_zc770_xm011_defconfig +++ b/configs/zynq_zc770_xm011_defconfig @@ -13,6 +13,7 @@ CONFIG_SPL_OS_BOOT=y CONFIG_HUSH_PARSER=y CONFIG_SYS_PROMPT="Zynq> " # CONFIG_CMD_IMLS is not set +CONFIG_CMD_SPL_NAND_OFS=0x0 # CONFIG_CMD_FLASH is not set CONFIG_CMD_NAND=y CONFIG_CMD_FPGA_LOADBP=y diff --git a/configs/zynq_zc770_xm012_defconfig b/configs/zynq_zc770_xm012_defconfig index 943efdb141..3e53373d04 100644 --- a/configs/zynq_zc770_xm012_defconfig +++ b/configs/zynq_zc770_xm012_defconfig @@ -12,6 +12,7 @@ CONFIG_SPL=y CONFIG_SPL_OS_BOOT=y CONFIG_HUSH_PARSER=y CONFIG_SYS_PROMPT="Zynq> " +CONFIG_CMD_SPL_NAND_OFS=0x0 CONFIG_CMD_FPGA_LOADBP=y CONFIG_CMD_FPGA_LOADFS=y CONFIG_CMD_FPGA_LOADMK=y diff --git a/configs/zynq_zc770_xm013_defconfig b/configs/zynq_zc770_xm013_defconfig index 5c029109e2..5f0f656c1a 100644 --- a/configs/zynq_zc770_xm013_defconfig +++ b/configs/zynq_zc770_xm013_defconfig @@ -13,6 +13,7 @@ CONFIG_SPL_OS_BOOT=y CONFIG_HUSH_PARSER=y CONFIG_SYS_PROMPT="Zynq> " # CONFIG_CMD_IMLS is not set +CONFIG_CMD_SPL_NAND_OFS=0x0 # CONFIG_CMD_FLASH is not set CONFIG_CMD_FPGA_LOADBP=y CONFIG_CMD_FPGA_LOADFS=y diff --git a/configs/zynq_zed_defconfig b/configs/zynq_zed_defconfig index 2887ca4167..de61ed406b 100644 --- a/configs/zynq_zed_defconfig +++ b/configs/zynq_zed_defconfig @@ -11,6 +11,7 @@ CONFIG_SPL_OS_BOOT=y CONFIG_HUSH_PARSER=y CONFIG_SYS_PROMPT="Zynq> " # CONFIG_CMD_IMLS is not set +CONFIG_CMD_SPL_NAND_OFS=0x0 # CONFIG_CMD_FLASH is not set CONFIG_CMD_MMC=y CONFIG_CMD_SF=y diff --git a/configs/zynq_zybo_defconfig b/configs/zynq_zybo_defconfig index f3f89cb5e4..2bc2f155f3 100644 --- a/configs/zynq_zybo_defconfig +++ b/configs/zynq_zybo_defconfig @@ -13,6 +13,7 @@ CONFIG_SPL_OS_BOOT=y CONFIG_HUSH_PARSER=y CONFIG_SYS_PROMPT="Zynq> " # CONFIG_CMD_IMLS is not set +CONFIG_CMD_SPL_NAND_OFS=0x0 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 b97f525994..3f2aa80693 100644 --- a/include/configs/am335x_evm.h +++ b/include/configs/am335x_evm.h @@ -239,7 +239,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 1d8e39c203..ff2c91da5c 100644 --- a/include/configs/am43xx_evm.h +++ b/include/configs/am43xx_evm.h @@ -322,7 +322,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 b58030663d..cf6d10cb72 100644 --- a/include/configs/baltos.h +++ b/include/configs/baltos.h @@ -48,7 +48,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 71b1b96ec4..5eadb70412 100644 --- a/include/configs/bav335x.h +++ b/include/configs/bav335x.h @@ -399,7 +399,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 e35ea0ea4a..813a3882a7 100644 --- 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 220268ade0..a6cc6f16a1 100644 --- a/include/configs/cm_t335.h +++ b/include/configs/cm_t335.h @@ -141,7 +141,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 92ce1273c6..d71912e8db 100644 --- a/include/configs/devkit8000.h +++ b/include/configs/devkit8000.h @@ -216,8 +216,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 d2f7c7cfff..8cee33d419 100644 --- a/include/configs/dra7xx_evm.h +++ b/include/configs/dra7xx_evm.h @@ -214,7 +214,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 321a487cb9..8529159f2b 100644 --- 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 2999ac36e7..23d66cecc5 100644 --- a/include/configs/ipam390.h +++ b/include/configs/ipam390.h @@ -287,7 +287,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 0d48d4ecc1..7432305431 100644 --- a/include/configs/omap3_beagle.h +++ b/include/configs/omap3_beagle.h @@ -280,7 +280,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 b5d2b007e8..981e90ee76 100644 --- a/include/configs/omap3_cairo.h +++ b/include/configs/omap3_cairo.h @@ -204,7 +204,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 2c926d0787..d265280ccf 100644 --- a/include/configs/omap3_logic.h +++ b/include/configs/omap3_logic.h @@ -274,7 +274,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 111aec58d3..7be5150784 100644 --- a/include/configs/omap3_overo.h +++ b/include/configs/omap3_overo.h @@ -225,7 +225,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 6c869c4c07..b05e096ea5 100644 --- 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 482045d99f..f7f50f1e36 100644 --- a/include/configs/pengwyn.h +++ b/include/configs/pengwyn.h @@ -165,7 +165,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 c45ae87a41..80d480b103 100644 --- 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 44d38f8ca1..e463e53f17 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -296,7 +296,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