From 72c3033fd1da878aec6b23eb9086a83f57d54eee Mon Sep 17 00:00:00 2001 From: Simon Glass Date: Fri, 4 Aug 2017 16:34:48 -0600 Subject: Convert CONFIG_CMD_SPL to Kconfig This converts the following to Kconfig: CONFIG_CMD_SPL Note that trats does not actually use SPL, so this option can no-longer be set. Signed-off-by: Simon Glass Reviewed-by: Bin Meng Reviewed-by: Philipp Tomsich diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index c6f5f23..43096d0 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -732,6 +732,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 bb2ce33..9bae748 100644 --- a/arch/arm/mach-imx/mx6/Kconfig +++ b/arch/arm/mach-imx/mx6/Kconfig @@ -145,6 +145,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 d8abba9..7260d27 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 5ac8389..1ca91fc 100644 --- a/cmd/Kconfig +++ b/cmd/Kconfig @@ -276,6 +276,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 2c153a8..bbda9d3 100644 --- a/configs/am335x_boneblack_defconfig +++ b/configs/am335x_boneblack_defconfig @@ -24,6 +24,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_DFU_TFTP=y diff --git a/configs/am335x_boneblack_vboot_defconfig b/configs/am335x_boneblack_vboot_defconfig index addfd09..596a083 100644 --- a/configs/am335x_boneblack_vboot_defconfig +++ b/configs/am335x_boneblack_vboot_defconfig @@ -27,6 +27,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 82d5a97..8c842c7 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_NAND=y # CONFIG_CMD_SETEXPR is not set diff --git a/configs/am335x_evm_nor_defconfig b/configs/am335x_evm_nor_defconfig index 3fb220a..061ac73 100644 --- a/configs/am335x_evm_nor_defconfig +++ b/configs/am335x_evm_nor_defconfig @@ -19,6 +19,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_NAND=y # CONFIG_CMD_SETEXPR is not set CONFIG_CMD_MTDPARTS=y diff --git a/configs/am335x_evm_usbspl_defconfig b/configs/am335x_evm_usbspl_defconfig index 55c13da..afb6204 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_NAND=y # CONFIG_CMD_SETEXPR is not set diff --git a/configs/am335x_igep003x_defconfig b/configs/am335x_igep003x_defconfig index 2ecd1d9..7ab2cb3 100644 --- a/configs/am335x_igep003x_defconfig +++ b/configs/am335x_igep003x_defconfig @@ -29,6 +29,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 41dd2da..e0956d5 100644 --- a/configs/am335x_sl50_defconfig +++ b/configs/am335x_sl50_defconfig @@ -29,6 +29,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 10a9b9e..1a87367 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_NAND=y # CONFIG_CMD_SETEXPR is not set diff --git a/configs/am43xx_evm_ethboot_defconfig b/configs/am43xx_evm_ethboot_defconfig index cb6a0d3..a53466c 100644 --- a/configs/am43xx_evm_ethboot_defconfig +++ b/configs/am43xx_evm_ethboot_defconfig @@ -15,6 +15,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 b25a3ee..99c1f9e 100644 --- a/configs/am43xx_evm_usbhost_boot_defconfig +++ b/configs/am43xx_evm_usbhost_boot_defconfig @@ -19,6 +19,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 d5ea25e..11be1ad 100644 --- a/configs/am57xx_evm_defconfig +++ b/configs/am57xx_evm_defconfig @@ -33,6 +33,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 03bac80..80eb9ee 100644 --- a/configs/am57xx_evm_nodt_defconfig +++ b/configs/am57xx_evm_nodt_defconfig @@ -24,6 +24,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 756f05f..e161037 100644 --- a/configs/birdland_bav335a_defconfig +++ b/configs/birdland_bav335a_defconfig @@ -26,6 +26,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 6f30ac5..f040aa0 100644 --- a/configs/birdland_bav335b_defconfig +++ b/configs/birdland_bav335b_defconfig @@ -26,6 +26,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 6996440..3122287 100644 --- a/configs/cairo_defconfig +++ b/configs/cairo_defconfig @@ -14,6 +14,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 9afc2ce..71a382d 100644 --- a/configs/devkit8000_defconfig +++ b/configs/devkit8000_defconfig @@ -10,6 +10,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_NAND=y diff --git a/configs/dra7xx_evm_defconfig b/configs/dra7xx_evm_defconfig index b8b4826..4fff0cf 100644 --- a/configs/dra7xx_evm_defconfig +++ b/configs/dra7xx_evm_defconfig @@ -32,6 +32,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/ipam390_defconfig b/configs/ipam390_defconfig index 0337afa..c97256d 100644 --- a/configs/ipam390_defconfig +++ b/configs/ipam390_defconfig @@ -17,6 +17,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 92324b4..492be51 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 d91dfe9..02e1d6a 100644 --- a/configs/mx6sabresd_defconfig +++ b/configs/mx6sabresd_defconfig @@ -22,6 +22,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 1a134df..7cb5662 100644 --- a/configs/omap3_beagle_defconfig +++ b/configs/omap3_beagle_defconfig @@ -11,6 +11,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 1eb1ff8..d1eb941 100644 --- a/configs/omap3_logic_defconfig +++ b/configs/omap3_logic_defconfig @@ -19,6 +19,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_NAND=y diff --git a/configs/omap3_overo_defconfig b/configs/omap3_overo_defconfig index 1a1dfcf..12dab49 100644 --- a/configs/omap3_overo_defconfig +++ b/configs/omap3_overo_defconfig @@ -16,6 +16,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 b950344..3e39e2f 100644 --- a/configs/omap4_panda_defconfig +++ b/configs/omap4_panda_defconfig @@ -15,6 +15,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 635bdf7..c613433 100644 --- a/configs/omap5_uevm_defconfig +++ b/configs/omap5_uevm_defconfig @@ -13,6 +13,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 3e61216..cd0af42 100644 --- a/configs/pcm051_rev1_defconfig +++ b/configs/pcm051_rev1_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/pcm051_rev3_defconfig b/configs/pcm051_rev3_defconfig index f921a9d..b16020a 100644 --- a/configs/pcm051_rev3_defconfig +++ b/configs/pcm051_rev3_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/pengwyn_defconfig b/configs/pengwyn_defconfig index aca3f46..545958a 100644 --- a/configs/pengwyn_defconfig +++ b/configs/pengwyn_defconfig @@ -29,6 +29,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 61132ee..46dbdd5 100644 --- a/configs/twister_defconfig +++ b/configs/twister_defconfig @@ -11,6 +11,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 18d1e7b..0c395e5 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 083ccd8..4824941 100644 --- a/include/configs/ipam390.h +++ b/include/configs/ipam390.h @@ -274,7 +274,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 8e7225c..926a8f6 100644 --- a/include/configs/microblaze-generic.h +++ b/include/configs/microblaze-generic.h @@ -233,7 +233,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 bd178a4..daebf5c 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 0fa4429..9622394 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 ccd7cd7..ac3eb5d 100644 --- a/include/configs/ti_armv7_common.h +++ b/include/configs/ti_armv7_common.h @@ -201,10 +201,6 @@ #define CONFIG_SYS_MMCSD_RAW_MODE_KERNEL_SECTOR 0x1700 /* address 0x2E0000 */ #define CONFIG_SYS_MMCSD_RAW_MODE_ARGS_SECTOR 0x1500 /* address 0x2A0000 */ #define CONFIG_SYS_MMCSD_RAW_MODE_ARGS_SECTORS 0x200 /* 256KiB */ - - -/* spl export command */ -#define CONFIG_CMD_SPL #endif /* General parts of the framework, required. */ diff --git a/include/configs/trats.h b/include/configs/trats.h index 3059d89..861eb26 100644 --- a/include/configs/trats.h +++ b/include/configs/trats.h @@ -166,7 +166,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 94dde90..c45ae87 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 056eef7..35e5c1e 100644 --- a/include/configs/zynq-common.h +++ b/include/configs/zynq-common.h @@ -318,7 +318,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 ef63888..663c7ad 100644 --- 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 CONFIG_CMD_SPL_NAND_OFS CONFIG_CMD_SPL_WRITE_SIZE CONFIG_CMD_STRINGS -- cgit v0.10.2