[U-Boot] [PATCH 24/41] Convert CONFIG_CMD_SPL to Kconfig
Bin Meng
bmeng.cn at gmail.com
Sat Jul 22 16:26:50 UTC 2017
Hi Simon,
On Sat, Jul 22, 2017 at 7:11 AM, Simon Glass <sjg at chromium.org> wrote:
> This converts the following to Kconfig:
> CONFIG_CMD_SPL
>
> Signed-off-by: Simon Glass <sjg at chromium.org>
> ---
>
> arch/arm/Kconfig | 1 +
> arch/arm/mach-imx/mx6/Kconfig | 1 +
> arch/arm/mach-omap2/am33xx/Kconfig | 1 +
> cmd/Kconfig | 9 +++++++++
> configs/am335x_boneblack_defconfig | 2 +-
> 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_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/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/twister_defconfig | 1 +
> include/configs/gw_ventana.h | 1 -
> include/configs/ipam390.h | 1 -
> include/configs/microblaze-generic.h | 1 -
> include/configs/mx6sabreauto.h | 1 -
> include/configs/mx6sabresd.h | 1 -
> include/configs/ti_armv7_common.h | 1 -
> include/configs/trats.h | 1 -
> include/configs/twister.h | 1 -
> include/configs/zynq-common.h | 1 -
> scripts/config_whitelist.txt | 1 -
> 46 files changed, 44 insertions(+), 11 deletions(-)
>
> diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
> index 3cc252ac27..c6cfac97ac 100644
> --- a/arch/arm/Kconfig
> +++ b/arch/arm/Kconfig
> @@ -728,6 +728,7 @@ config ARCH_ZYNQ
> select CLK_ZYNQ
> imply CMD_CLK
> imply FAT_WRITE
> + imply CMD_SPL
>
> config ARCH_ZYNQMP
> bool "Support Xilinx ZynqMP Platform"
> diff --git a/arch/arm/mach-imx/mx6/Kconfig b/arch/arm/mach-imx/mx6/Kconfig
> index 1595a764c5..6461c88b17 100644
> --- a/arch/arm/mach-imx/mx6/Kconfig
> +++ b/arch/arm/mach-imx/mx6/Kconfig
> @@ -144,6 +144,7 @@ config TARGET_GW_VENTANA
> bool "gw_ventana"
> select SUPPORT_SPL
> imply CMD_SATA
> + imply CMD_SPL
>
> config TARGET_KOSAGI_NOVENA
> bool "Kosagi Novena"
> diff --git a/arch/arm/mach-omap2/am33xx/Kconfig b/arch/arm/mach-omap2/am33xx/Kconfig
> index d8abba992a..7260d27877 100644
> --- a/arch/arm/mach-omap2/am33xx/Kconfig
> +++ b/arch/arm/mach-omap2/am33xx/Kconfig
> @@ -81,6 +81,7 @@ config TARGET_AM335X_SHC
> select DM
> select DM_SERIAL
> select DM_GPIO
> + imply CMD_SPL
>
> config TARGET_AM335X_SL50
> bool "Support am335x_sl50"
> diff --git a/cmd/Kconfig b/cmd/Kconfig
> index d01fda2450..0cc5d56d7f 100644
> --- a/cmd/Kconfig
> +++ b/cmd/Kconfig
> @@ -270,6 +270,15 @@ config CMD_POWEROFF
> help
> Poweroff/Shutdown the system
>
> +config CMD_SPL
> + bool "spl export - Export boot information for Falcon boot"
> + depends on SPL
> + help
> + Falcon mode allows booting directly from SPL into an Operating
> + System such as Linux, thus skipping U-Boot proper. See
> + doc/README.falcon for full information about how to use this
> + command.
> +
> endmenu
>
> menu "Environment commands"
> diff --git a/configs/am335x_boneblack_defconfig b/configs/am335x_boneblack_defconfig
> index c69867705e..195b24f7f7 100644
> --- a/configs/am335x_boneblack_defconfig
> +++ b/configs/am335x_boneblack_defconfig
> @@ -22,8 +22,8 @@ CONFIG_USB_FUNCTION_FASTBOOT=y
> CONFIG_FASTBOOT_BUF_ADDR=0x81000000
> CONFIG_FASTBOOT_BUF_SIZE=0x07000000
> # CONFIG_CMD_IMLS is not set
> +CONFIG_CMD_SPL=y
> # CONFIG_CMD_FLASH is not set
> -CONFIG_CMD_FASTBOOT=y
> # CONFIG_CMD_SETEXPR is not set
> CONFIG_DFU_TFTP=y
> CONFIG_DFU_MMC=y
> diff --git a/configs/am335x_boneblack_vboot_defconfig b/configs/am335x_boneblack_vboot_defconfig
> index b11d0a71da..e7890fc8b5 100644
> --- a/configs/am335x_boneblack_vboot_defconfig
> +++ b/configs/am335x_boneblack_vboot_defconfig
> @@ -25,6 +25,7 @@ CONFIG_USB_FUNCTION_FASTBOOT=y
> CONFIG_FASTBOOT_BUF_ADDR=0x81000000
> CONFIG_FASTBOOT_BUF_SIZE=0x07000000
> # CONFIG_CMD_IMLS is not set
> +CONFIG_CMD_SPL=y
> # 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 860ef7dd95..2e5bb103a5 100644
> --- a/configs/am335x_evm_defconfig
> +++ b/configs/am335x_evm_defconfig
> @@ -20,6 +20,7 @@ CONFIG_USB_FUNCTION_FASTBOOT=y
> CONFIG_FASTBOOT_BUF_ADDR=0x81000000
> CONFIG_FASTBOOT_BUF_SIZE=0x07000000
> # CONFIG_CMD_IMLS is not set
> +CONFIG_CMD_SPL=y
> # 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 9cadc0b61a..c70cd6d247 100644
> --- a/configs/am335x_evm_nor_defconfig
> +++ b/configs/am335x_evm_nor_defconfig
> @@ -19,6 +19,7 @@ CONFIG_CMD_FASTBOOT=y
> CONFIG_FASTBOOT_BUF_ADDR=0x81000000
> CONFIG_FASTBOOT_BUF_SIZE=0x07000000
> # CONFIG_CMD_IMLS is not set
> +CONFIG_CMD_SPL=y
> 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 0a6e26eba9..49f732b81e 100644
> --- a/configs/am335x_evm_usbspl_defconfig
> +++ b/configs/am335x_evm_usbspl_defconfig
> @@ -22,6 +22,7 @@ CONFIG_USB_FUNCTION_FASTBOOT=y
> CONFIG_FASTBOOT_BUF_ADDR=0x81000000
> CONFIG_FASTBOOT_BUF_SIZE=0x07000000
> # CONFIG_CMD_IMLS is not set
> +CONFIG_CMD_SPL=y
> # 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 8fc31461f1..cef7c315cf 100644
> --- a/configs/am335x_igep003x_defconfig
> +++ b/configs/am335x_igep003x_defconfig
> @@ -28,6 +28,7 @@ CONFIG_SPL_YMODEM_SUPPORT=y
> CONFIG_HUSH_PARSER=y
> CONFIG_CMD_BOOTZ=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/am335x_sl50_defconfig b/configs/am335x_sl50_defconfig
> index 855e1ca9e2..10e1d1c870 100644
> --- a/configs/am335x_sl50_defconfig
> +++ b/configs/am335x_sl50_defconfig
> @@ -28,6 +28,7 @@ CONFIG_AUTOBOOT_PROMPT="Press SPACE to abort autoboot in %d seconds\n"
> CONFIG_AUTOBOOT_DELAY_STR="d"
> CONFIG_AUTOBOOT_STOP_STR=" "
> # CONFIG_CMD_IMLS is not set
> +CONFIG_CMD_SPL=y
> 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 83a48b8b3e..5d707b92e3 100644
> --- a/configs/am43xx_evm_defconfig
> +++ b/configs/am43xx_evm_defconfig
> @@ -15,6 +15,7 @@ CONFIG_SPL_MTD_SUPPORT=y
> CONFIG_SPL_OS_BOOT=y
> CONFIG_HUSH_PARSER=y
> # CONFIG_CMD_IMLS is not set
> +CONFIG_CMD_SPL=y
> # 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 dfac27b929..19d596278d 100644
> --- a/configs/am43xx_evm_ethboot_defconfig
> +++ b/configs/am43xx_evm_ethboot_defconfig
> @@ -14,6 +14,7 @@ CONFIG_SPL_OS_BOOT=y
> CONFIG_HUSH_PARSER=y
> CONFIG_CMD_BOOTZ=y
> # CONFIG_CMD_IMLS is not set
> +CONFIG_CMD_SPL=y
> 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 8fa6d91b43..fd6ff5f285 100644
> --- a/configs/am43xx_evm_usbhost_boot_defconfig
> +++ b/configs/am43xx_evm_usbhost_boot_defconfig
> @@ -18,6 +18,7 @@ CONFIG_SPL_USB_SUPPORT=y
> CONFIG_HUSH_PARSER=y
> CONFIG_CMD_BOOTZ=y
> # CONFIG_CMD_IMLS is not set
> +CONFIG_CMD_SPL=y
> 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 658ab92487..4b1ceb820b 100644
> --- a/configs/am57xx_evm_defconfig
> +++ b/configs/am57xx_evm_defconfig
> @@ -31,6 +31,7 @@ CONFIG_FASTBOOT_USB_DEV=1
> CONFIG_FASTBOOT_FLASH=y
> CONFIG_FASTBOOT_FLASH_MMC_DEV=1
> # CONFIG_CMD_IMLS is not set
> +CONFIG_CMD_SPL=y
> # 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 6048e6c911..d8cbcda21a 100644
> --- a/configs/am57xx_evm_nodt_defconfig
> +++ b/configs/am57xx_evm_nodt_defconfig
> @@ -23,6 +23,7 @@ CONFIG_FASTBOOT_FLASH=y
> CONFIG_FASTBOOT_FLASH_MMC_DEV=1
> CONFIG_CMD_BOOTZ=y
> # CONFIG_CMD_IMLS is not set
> +CONFIG_CMD_SPL=y
> 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 073a58d94e..18e0100a7b 100644
> --- a/configs/birdland_bav335a_defconfig
> +++ b/configs/birdland_bav335a_defconfig
> @@ -25,6 +25,7 @@ CONFIG_SPL_YMODEM_SUPPORT=y
> CONFIG_HUSH_PARSER=y
> CONFIG_CMD_BOOTZ=y
> # CONFIG_CMD_IMLS is not set
> +CONFIG_CMD_SPL=y
> 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 5269c177d4..a143142ae7 100644
> --- a/configs/birdland_bav335b_defconfig
> +++ b/configs/birdland_bav335b_defconfig
> @@ -25,6 +25,7 @@ CONFIG_SPL_YMODEM_SUPPORT=y
> CONFIG_HUSH_PARSER=y
> CONFIG_CMD_BOOTZ=y
> # CONFIG_CMD_IMLS is not set
> +CONFIG_CMD_SPL=y
> 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 f6caae0280..a1506ff339 100644
> --- a/configs/cairo_defconfig
> +++ b/configs/cairo_defconfig
> @@ -12,6 +12,7 @@ CONFIG_SYS_PROMPT="Cairo # "
> CONFIG_CMD_BOOTZ=y
> # CONFIG_CMD_IMI is not set
> # 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/devkit8000_defconfig b/configs/devkit8000_defconfig
> index d2c2010d55..17cdab7428 100644
> --- a/configs/devkit8000_defconfig
> +++ b/configs/devkit8000_defconfig
> @@ -8,6 +8,7 @@ CONFIG_SPL_OS_BOOT=y
> CONFIG_HUSH_PARSER=y
> # CONFIG_CMD_IMI is not set
> # CONFIG_CMD_IMLS is not set
> +CONFIG_CMD_SPL=y
> # 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 6dd1baf6e9..4634e8e7af 100644
> --- a/configs/dra7xx_evm_defconfig
> +++ b/configs/dra7xx_evm_defconfig
> @@ -30,6 +30,7 @@ CONFIG_FASTBOOT_BUF_SIZE=0x2f000000
> CONFIG_FASTBOOT_FLASH=y
> CONFIG_FASTBOOT_FLASH_MMC_DEV=1
> # CONFIG_CMD_IMLS is not set
> +CONFIG_CMD_SPL=y
> # CONFIG_CMD_FLASH is not set
> # CONFIG_CMD_SETEXPR is not set
> CONFIG_ISO_PARTITION=y
> diff --git a/configs/igep0020_defconfig b/configs/igep0020_defconfig
> index a347c547e2..bcd4f22b79 100644
> --- a/configs/igep0020_defconfig
> +++ b/configs/igep0020_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/igep0030_defconfig b/configs/igep0030_defconfig
> index 01e340832b..30ab21079e 100644
> --- a/configs/igep0030_defconfig
> +++ b/configs/igep0030_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/igep0032_defconfig b/configs/igep0032_defconfig
> index 71e01a59bf..493bf41713 100644
> --- a/configs/igep0032_defconfig
> +++ b/configs/igep0032_defconfig
> @@ -14,6 +14,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 3c32a6b0ec..68bbe8667d 100644
> --- a/configs/ipam390_defconfig
> +++ b/configs/ipam390_defconfig
> @@ -16,6 +16,7 @@ CONFIG_SPL_OS_BOOT=y
> CONFIG_HUSH_PARSER=y
> CONFIG_SYS_PROMPT="U-Boot > "
> # CONFIG_CMD_IMLS is not set
> +CONFIG_CMD_SPL=y
> 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 471be29ee5..45aaf3bbd5 100644
> --- a/configs/microblaze-generic_defconfig
> +++ b/configs/microblaze-generic_defconfig
> @@ -21,6 +21,7 @@ CONFIG_SPL_OS_BOOT=y
> CONFIG_SYS_OS_BASE=0x2c060000
> CONFIG_HUSH_PARSER=y
> CONFIG_SYS_PROMPT="U-Boot-mONStR> "
> +CONFIG_CMD_SPL=y
> CONFIG_CMD_ASKENV=y
> CONFIG_CMD_GPIO=y
> CONFIG_CMD_MFSL=y
> diff --git a/configs/mx6sabresd_defconfig b/configs/mx6sabresd_defconfig
> index 535c98005f..7bd6da1654 100644
> --- a/configs/mx6sabresd_defconfig
> +++ b/configs/mx6sabresd_defconfig
> @@ -21,6 +21,7 @@ CONFIG_SPL_OS_BOOT=y
> CONFIG_HUSH_PARSER=y
> CONFIG_CMD_BOOTZ=y
> # CONFIG_CMD_IMLS is not set
> +CONFIG_CMD_SPL=y
> # 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 fbffc3c33e..aebacd2918 100644
> --- a/configs/omap3_beagle_defconfig
> +++ b/configs/omap3_beagle_defconfig
> @@ -9,6 +9,7 @@ CONFIG_SPL=y
> CONFIG_SPL_MTD_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/omap3_logic_defconfig b/configs/omap3_logic_defconfig
> index db8f4683e2..022a7c15c8 100644
> --- a/configs/omap3_logic_defconfig
> +++ b/configs/omap3_logic_defconfig
> @@ -17,6 +17,7 @@ CONFIG_HUSH_PARSER=y
> CONFIG_SYS_PROMPT="OMAP Logic # "
> # CONFIG_CMD_IMI is not set
> # CONFIG_CMD_IMLS is not set
> +CONFIG_CMD_SPL=y
> # 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 f4c3d3233d..a5e2f25873 100644
> --- a/configs/omap3_overo_defconfig
> +++ b/configs/omap3_overo_defconfig
> @@ -15,6 +15,7 @@ CONFIG_SYS_PROMPT="Overo # "
> CONFIG_CMD_BOOTZ=y
> # CONFIG_CMD_IMI is not set
> # 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/omap4_panda_defconfig b/configs/omap4_panda_defconfig
> index 3d91f137e8..44eaed8590 100644
> --- a/configs/omap4_panda_defconfig
> +++ b/configs/omap4_panda_defconfig
> @@ -12,6 +12,7 @@ CONFIG_SPL=y
> # CONFIG_SPL_I2C_SUPPORT is not set
> 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/omap5_uevm_defconfig b/configs/omap5_uevm_defconfig
> index 0af00b14be..81edba49b3 100644
> --- a/configs/omap5_uevm_defconfig
> +++ b/configs/omap5_uevm_defconfig
> @@ -12,6 +12,7 @@ CONFIG_SPL_OS_BOOT=y
> CONFIG_HUSH_PARSER=y
> CONFIG_CMD_BOOTZ=y
> # CONFIG_CMD_IMLS is not set
> +CONFIG_CMD_SPL=y
> 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 466aa511ba..8faaad9b6f 100644
> --- a/configs/pcm051_rev1_defconfig
> +++ b/configs/pcm051_rev1_defconfig
> @@ -27,6 +27,7 @@ CONFIG_SPL_YMODEM_SUPPORT=y
> CONFIG_HUSH_PARSER=y
> CONFIG_CMD_BOOTZ=y
> # CONFIG_CMD_IMLS is not set
> +CONFIG_CMD_SPL=y
> 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 7150e79ed6..b2126f0f56 100644
> --- a/configs/pcm051_rev3_defconfig
> +++ b/configs/pcm051_rev3_defconfig
> @@ -27,6 +27,7 @@ CONFIG_SPL_YMODEM_SUPPORT=y
> CONFIG_HUSH_PARSER=y
> CONFIG_CMD_BOOTZ=y
> # CONFIG_CMD_IMLS is not set
> +CONFIG_CMD_SPL=y
> 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 6b30c7ad78..0a3553f60f 100644
> --- a/configs/pengwyn_defconfig
> +++ b/configs/pengwyn_defconfig
> @@ -28,6 +28,7 @@ CONFIG_SPL_YMODEM_SUPPORT=y
> CONFIG_HUSH_PARSER=y
> CONFIG_CMD_BOOTZ=y
> # CONFIG_CMD_IMLS is not set
> +CONFIG_CMD_SPL=y
> 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 f7c933630b..4d3157a28b 100644
> --- a/configs/twister_defconfig
> +++ b/configs/twister_defconfig
> @@ -9,6 +9,7 @@ CONFIG_SPL_OS_BOOT=y
> CONFIG_HUSH_PARSER=y
> CONFIG_SYS_PROMPT="twister => "
> # CONFIG_CMD_IMLS is not set
> +CONFIG_CMD_SPL=y
> CONFIG_CMD_EEPROM=y
> # CONFIG_CMD_FLASH is not set
> CONFIG_CMD_MMC=y
> diff --git a/include/configs/gw_ventana.h b/include/configs/gw_ventana.h
> index 56c002ee4e..321a487cb9 100644
> --- a/include/configs/gw_ventana.h
> +++ b/include/configs/gw_ventana.h
> @@ -12,7 +12,6 @@
> #define CONFIG_SYS_NAND_U_BOOT_OFFS (14 * SZ_1M)
>
> /* Falcon Mode */
> -#define CONFIG_CMD_SPL
> #define CONFIG_SYS_SPL_ARGS_ADDR 0x18000000
> #define CONFIG_CMD_SPL_WRITE_SIZE (128 * SZ_1K)
>
> diff --git a/include/configs/ipam390.h b/include/configs/ipam390.h
> index 95cd769843..2999ac36e7 100644
> --- a/include/configs/ipam390.h
> +++ b/include/configs/ipam390.h
> @@ -285,7 +285,6 @@
> GENERATED_GBL_DATA_SIZE)
>
> /* add FALCON boot mode */
> -#define CONFIG_CMD_SPL
> #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
> diff --git a/include/configs/microblaze-generic.h b/include/configs/microblaze-generic.h
> index 5a1875ad15..b71f85b163 100644
> --- a/include/configs/microblaze-generic.h
> +++ b/include/configs/microblaze-generic.h
> @@ -260,7 +260,6 @@
> #endif
>
> /* SPL part */
> -#define CONFIG_CMD_SPL
> #define CONFIG_SPL_FRAMEWORK
>
> #define CONFIG_SPL_LDSCRIPT "arch/microblaze/cpu/u-boot-spl.lds"
> diff --git a/include/configs/mx6sabreauto.h b/include/configs/mx6sabreauto.h
> index 900e2a904b..f561bfd2a3 100644
> --- a/include/configs/mx6sabreauto.h
> +++ b/include/configs/mx6sabreauto.h
> @@ -34,7 +34,6 @@
> #ifdef CONFIG_SPL_OS_BOOT
> #define CONFIG_SPL_FS_LOAD_ARGS_NAME "args"
> #define CONFIG_SPL_FS_LOAD_KERNEL_NAME "uImage"
> -#define CONFIG_CMD_SPL
> #define CONFIG_SYS_SPL_ARGS_ADDR 0x18000000
> #define CONFIG_CMD_SPL_WRITE_SIZE (128 * SZ_1K)
>
> diff --git a/include/configs/mx6sabresd.h b/include/configs/mx6sabresd.h
> index 0fa442985a..9622394c8f 100644
> --- a/include/configs/mx6sabresd.h
> +++ b/include/configs/mx6sabresd.h
> @@ -24,7 +24,6 @@
> /* Falcon Mode */
> #define CONFIG_SPL_FS_LOAD_ARGS_NAME "args"
> #define CONFIG_SPL_FS_LOAD_KERNEL_NAME "uImage"
> -#define CONFIG_CMD_SPL
> #define CONFIG_SYS_SPL_ARGS_ADDR 0x18000000
> #define CONFIG_CMD_SPL_WRITE_SIZE (128 * SZ_1K)
>
> diff --git a/include/configs/ti_armv7_common.h b/include/configs/ti_armv7_common.h
> index a94748c35d..dc7cd92e80 100644
> --- a/include/configs/ti_armv7_common.h
> +++ b/include/configs/ti_armv7_common.h
> @@ -204,7 +204,6 @@
>
>
> /* spl export command */
The above comments should be removed.
> -#define CONFIG_CMD_SPL
> #endif
>
> /* General parts of the framework, required. */
> diff --git a/include/configs/trats.h b/include/configs/trats.h
> index e08bbc49ae..affdf0230e 100644
> --- a/include/configs/trats.h
> +++ b/include/configs/trats.h
> @@ -167,7 +167,6 @@
> "fdtaddr=40800000\0" \
>
> /* Falcon mode definitions */
> -#define CONFIG_CMD_SPL
> #define CONFIG_SYS_SPL_ARGS_ADDR CONFIG_SYS_SDRAM_BASE + 0x100
>
> /* GPT */
> diff --git a/include/configs/twister.h b/include/configs/twister.h
> index 94dde90e60..c45ae87a41 100644
> --- a/include/configs/twister.h
> +++ b/include/configs/twister.h
> @@ -36,7 +36,6 @@
> "bootcmd=run nandboot\0"
>
> /* SPL OS boot options */
> -#define CONFIG_CMD_SPL
> #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+\
> diff --git a/include/configs/zynq-common.h b/include/configs/zynq-common.h
> index 4b6b088851..b69f4c7ba4 100644
> --- a/include/configs/zynq-common.h
> +++ b/include/configs/zynq-common.h
> @@ -276,7 +276,6 @@
> /* Commands */
>
> /* SPL part */
> -#define CONFIG_CMD_SPL
> #define CONFIG_SPL_FRAMEWORK
>
> #define CONFIG_SPL_LDSCRIPT "arch/arm/mach-zynq/u-boot-spl.lds"
> diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt
> index 1a39eb41b4..44d38f8ca1 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
> CONFIG_CMD_SPL_NAND_OFS
> CONFIG_CMD_SPL_WRITE_SIZE
> CONFIG_CMD_STRINGS
> --
Other than that,
Reviewed-by: Bin Meng <bmeng.cn at gmail.com>
Regards,
Bin
More information about the U-Boot
mailing list