Make more use of the Kconfig and move CONFIG_CMD_BOOTZ config option to defconfigs for ti omap/am based boards.
Signed-off-by: Igor Grinberg grinberg@compulab.co.il Cc: Yegor Yefremov yegorslists@googlemail.com Cc: Enric Balletbo i Serra eballetbo@iseebcn.com Cc: Lokesh Vutla lokeshvutla@ti.com Cc: Felipe Balbi balbi@ti.com Cc: Gilles Gameiro gilles@gigadevices.com Cc: "Albert ARIBAUD (3ADEV)" albert.aribaud@3adev.fr Cc: Nikita Kiryanov nikita@compulab.co.il Cc: Dmitry Lifshitz lifshitz@compulab.co.il Cc: Roger Meier r.meier@siemens.com Cc: Thomas Weber weber@corscience.de Cc: Ash Charles ash@gumstix.com Cc: Vitaly Andrianov vitalya@ti.com Cc: Steve Sakoman sakoman@gmail.com Cc: Grazvydas Ignotas notasas@gmail.com Cc: Nishanth Menon nm@ti.com Cc: Lars Poeschel poeschel@lemonage.de Cc: Lothar Felten lothar.felten@gmail.com --- configs/am335x_baltos_defconfig | 1 + configs/am335x_evm_defconfig | 1 + configs/am335x_evm_nor_defconfig | 1 + configs/am335x_evm_norboot_defconfig | 1 + configs/am335x_evm_spiboot_defconfig | 1 + configs/am335x_evm_usbspl_defconfig | 1 + configs/am335x_igep0033_defconfig | 1 + configs/am43xx_evm_defconfig | 1 + configs/am43xx_evm_ethboot_defconfig | 1 + configs/am43xx_evm_qspiboot_defconfig | 1 + configs/am43xx_evm_usbhost_boot_defconfig | 1 + configs/beagle_x15_defconfig | 1 + configs/birdland_bav335a_defconfig | 1 + configs/birdland_bav335b_defconfig | 1 + configs/cairo_defconfig | 1 + configs/cm_t335_defconfig | 1 + configs/cm_t35_defconfig | 1 + configs/cm_t43_defconfig | 1 + configs/cm_t54_defconfig | 1 + configs/dra72_evm_defconfig | 1 + configs/dra7xx_evm_defconfig | 1 + configs/dra7xx_evm_qspiboot_defconfig | 1 + configs/dra7xx_evm_uart3_defconfig | 1 + configs/draco_defconfig | 1 + configs/duovero_defconfig | 1 + configs/igep0020_defconfig | 1 + configs/igep0020_nand_defconfig | 1 + configs/igep0030_defconfig | 1 + configs/igep0030_nand_defconfig | 1 + configs/igep0032_defconfig | 1 + configs/k2e_evm_defconfig | 1 + configs/k2hk_evm_defconfig | 1 + configs/k2l_evm_defconfig | 1 + configs/omap3_beagle_defconfig | 1 + configs/omap3_overo_defconfig | 1 + configs/omap3_pandora_defconfig | 1 + configs/omap3_zoom1_defconfig | 1 + configs/omap4_panda_defconfig | 1 + configs/omap4_sdp4430_defconfig | 1 + configs/omap5_uevm_defconfig | 1 + configs/pcm051_rev1_defconfig | 1 + configs/pcm051_rev3_defconfig | 1 + configs/pengwyn_defconfig | 1 + configs/pepper_defconfig | 1 + configs/pxm2_defconfig | 1 + configs/rastaban_defconfig | 1 + configs/rut_defconfig | 1 + configs/thuban_defconfig | 1 + include/config_distro_defaults.h | 2 ++ include/configs/cm_t35.h | 1 - include/configs/devkit8000.h | 1 - include/configs/ti_armv7_common.h | 1 - 52 files changed, 50 insertions(+), 3 deletions(-)
diff --git a/configs/am335x_baltos_defconfig b/configs/am335x_baltos_defconfig index 884fdf5..c20af0e 100644 --- a/configs/am335x_baltos_defconfig +++ b/configs/am335x_baltos_defconfig @@ -10,3 +10,4 @@ CONFIG_SYS_EXTRA_OPTIONS="NAND" # CONFIG_CMD_FLASH is not set # CONFIG_CMD_SETEXPR is not set CONFIG_HUSH_PARSER=y +CONFIG_CMD_BOOTZ=y diff --git a/configs/am335x_evm_defconfig b/configs/am335x_evm_defconfig index 3358cf8..396f082 100644 --- a/configs/am335x_evm_defconfig +++ b/configs/am335x_evm_defconfig @@ -9,3 +9,4 @@ CONFIG_SYS_EXTRA_OPTIONS="NAND" # CONFIG_CMD_SETEXPR is not set CONFIG_SPI_FLASH=y CONFIG_HUSH_PARSER=y +CONFIG_CMD_BOOTZ=y diff --git a/configs/am335x_evm_nor_defconfig b/configs/am335x_evm_nor_defconfig index d42ce40..2cbb73d 100644 --- a/configs/am335x_evm_nor_defconfig +++ b/configs/am335x_evm_nor_defconfig @@ -9,3 +9,4 @@ CONFIG_SYS_EXTRA_OPTIONS="NAND" # CONFIG_CMD_SETEXPR is not set CONFIG_SPI_FLASH=y CONFIG_HUSH_PARSER=y +CONFIG_CMD_BOOTZ=y diff --git a/configs/am335x_evm_norboot_defconfig b/configs/am335x_evm_norboot_defconfig index 3584763..c5655ca 100644 --- a/configs/am335x_evm_norboot_defconfig +++ b/configs/am335x_evm_norboot_defconfig @@ -6,3 +6,4 @@ CONFIG_NOR_BOOT=y # CONFIG_CMD_SETEXPR is not set CONFIG_SPI_FLASH=y CONFIG_HUSH_PARSER=y +CONFIG_CMD_BOOTZ=y diff --git a/configs/am335x_evm_spiboot_defconfig b/configs/am335x_evm_spiboot_defconfig index cb96ed3..e0d4c83 100644 --- a/configs/am335x_evm_spiboot_defconfig +++ b/configs/am335x_evm_spiboot_defconfig @@ -9,3 +9,4 @@ CONFIG_SYS_EXTRA_OPTIONS="SPI_BOOT" # CONFIG_CMD_SETEXPR is not set CONFIG_SPI_FLASH=y CONFIG_HUSH_PARSER=y +CONFIG_CMD_BOOTZ=y diff --git a/configs/am335x_evm_usbspl_defconfig b/configs/am335x_evm_usbspl_defconfig index 85667f3..710c1bd 100644 --- a/configs/am335x_evm_usbspl_defconfig +++ b/configs/am335x_evm_usbspl_defconfig @@ -9,3 +9,4 @@ CONFIG_SYS_EXTRA_OPTIONS="NAND,SPL_USBETH_SUPPORT" # CONFIG_CMD_SETEXPR is not set CONFIG_SPI_FLASH=y CONFIG_HUSH_PARSER=y +CONFIG_CMD_BOOTZ=y diff --git a/configs/am335x_igep0033_defconfig b/configs/am335x_igep0033_defconfig index fc2f79b..d89af42 100644 --- a/configs/am335x_igep0033_defconfig +++ b/configs/am335x_igep0033_defconfig @@ -7,3 +7,4 @@ CONFIG_SPL_STACK_R_ADDR=0x82000000 # CONFIG_CMD_FLASH is not set # CONFIG_CMD_SETEXPR is not set CONFIG_HUSH_PARSER=y +CONFIG_CMD_BOOTZ=y diff --git a/configs/am43xx_evm_defconfig b/configs/am43xx_evm_defconfig index a44df2d..526373f 100644 --- a/configs/am43xx_evm_defconfig +++ b/configs/am43xx_evm_defconfig @@ -8,3 +8,4 @@ CONFIG_SYS_EXTRA_OPTIONS="SERIAL1,CONS_INDEX=1,NAND" CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_BAR=y CONFIG_HUSH_PARSER=y +CONFIG_CMD_BOOTZ=y diff --git a/configs/am43xx_evm_ethboot_defconfig b/configs/am43xx_evm_ethboot_defconfig index 393dbe9..4ebe3ef 100644 --- a/configs/am43xx_evm_ethboot_defconfig +++ b/configs/am43xx_evm_ethboot_defconfig @@ -7,3 +7,4 @@ CONFIG_SYS_EXTRA_OPTIONS="SERIAL1,CONS_INDEX=1,NAND,SPL_ETH_SUPPORT" # CONFIG_CMD_SETEXPR is not set CONFIG_SPI_FLASH=y CONFIG_HUSH_PARSER=y +CONFIG_CMD_BOOTZ=y diff --git a/configs/am43xx_evm_qspiboot_defconfig b/configs/am43xx_evm_qspiboot_defconfig index d4ae25f..c105ff6 100644 --- a/configs/am43xx_evm_qspiboot_defconfig +++ b/configs/am43xx_evm_qspiboot_defconfig @@ -6,3 +6,4 @@ CONFIG_SYS_EXTRA_OPTIONS="SERIAL1,CONS_INDEX=1,QSPI,QSPI_BOOT" # CONFIG_CMD_SETEXPR is not set CONFIG_SPI_FLASH=y CONFIG_HUSH_PARSER=y +CONFIG_CMD_BOOTZ=y diff --git a/configs/am43xx_evm_usbhost_boot_defconfig b/configs/am43xx_evm_usbhost_boot_defconfig index ae8ac44..392747d 100644 --- a/configs/am43xx_evm_usbhost_boot_defconfig +++ b/configs/am43xx_evm_usbhost_boot_defconfig @@ -7,3 +7,4 @@ CONFIG_SYS_EXTRA_OPTIONS="SERIAL1,CONS_INDEX=1,NAND,SPL_USB_HOST_SUPPORT" # CONFIG_CMD_SETEXPR is not set CONFIG_SPI_FLASH=y CONFIG_HUSH_PARSER=y +CONFIG_CMD_BOOTZ=y diff --git a/configs/beagle_x15_defconfig b/configs/beagle_x15_defconfig index d8344f0..b6abfba 100644 --- a/configs/beagle_x15_defconfig +++ b/configs/beagle_x15_defconfig @@ -7,3 +7,4 @@ CONFIG_SYS_EXTRA_OPTIONS="CONS_INDEX=3" # CONFIG_CMD_FLASH is not set # CONFIG_CMD_SETEXPR is not set CONFIG_HUSH_PARSER=y +CONFIG_CMD_BOOTZ=y diff --git a/configs/birdland_bav335a_defconfig b/configs/birdland_bav335a_defconfig index 37e8180..0e37edf 100644 --- a/configs/birdland_bav335a_defconfig +++ b/configs/birdland_bav335a_defconfig @@ -8,3 +8,4 @@ CONFIG_SYS_EXTRA_OPTIONS="SERIAL1,CONS_INDEX=1" # CONFIG_CMD_SETEXPR is not set CONFIG_SPI_FLASH=y CONFIG_HUSH_PARSER=y +CONFIG_CMD_BOOTZ=y diff --git a/configs/birdland_bav335b_defconfig b/configs/birdland_bav335b_defconfig index 05bcc26..0ac5b49 100644 --- a/configs/birdland_bav335b_defconfig +++ b/configs/birdland_bav335b_defconfig @@ -8,3 +8,4 @@ CONFIG_SYS_EXTRA_OPTIONS="SERIAL1,CONS_INDEX=1" # CONFIG_CMD_SETEXPR is not set CONFIG_SPI_FLASH=y CONFIG_HUSH_PARSER=y +CONFIG_CMD_BOOTZ=y diff --git a/configs/cairo_defconfig b/configs/cairo_defconfig index b5a66ce..a972ad7 100644 --- a/configs/cairo_defconfig +++ b/configs/cairo_defconfig @@ -9,3 +9,4 @@ CONFIG_SPL=y # CONFIG_CMD_NET is not set CONFIG_SYS_PROMPT="Cairo # " CONFIG_HUSH_PARSER=y +CONFIG_CMD_BOOTZ=y diff --git a/configs/cm_t335_defconfig b/configs/cm_t335_defconfig index 81aa52d..ad1b008 100644 --- a/configs/cm_t335_defconfig +++ b/configs/cm_t335_defconfig @@ -6,3 +6,4 @@ CONFIG_SPL=y # CONFIG_CMD_SETEXPR is not set CONFIG_SYS_PROMPT="CM-T335 # " CONFIG_HUSH_PARSER=y +CONFIG_CMD_BOOTZ=y diff --git a/configs/cm_t35_defconfig b/configs/cm_t35_defconfig index 966b81f..c94882a 100644 --- a/configs/cm_t35_defconfig +++ b/configs/cm_t35_defconfig @@ -4,6 +4,7 @@ CONFIG_TARGET_CM_T35=y CONFIG_SPL=y CONFIG_HUSH_PARSER=y CONFIG_SYS_PROMPT="CM-T3x # " +CONFIG_CMD_BOOTZ=y # CONFIG_CMD_IMLS is not set # CONFIG_CMD_FLASH is not set # CONFIG_CMD_FPGA is not set diff --git a/configs/cm_t43_defconfig b/configs/cm_t43_defconfig index 242b8c7..04fd46f 100644 --- a/configs/cm_t43_defconfig +++ b/configs/cm_t43_defconfig @@ -9,3 +9,4 @@ CONFIG_CMD_USB=y # CONFIG_CMD_NFS is not set CONFIG_DM=y CONFIG_DM_GPIO=y +CONFIG_CMD_BOOTZ=y diff --git a/configs/cm_t54_defconfig b/configs/cm_t54_defconfig index fd4b3f3..af4c6c6 100644 --- a/configs/cm_t54_defconfig +++ b/configs/cm_t54_defconfig @@ -8,3 +8,4 @@ CONFIG_SPL=y # CONFIG_CMD_NFS is not set CONFIG_SYS_PROMPT="CM-T54 # " CONFIG_HUSH_PARSER=y +CONFIG_CMD_BOOTZ=y diff --git a/configs/dra72_evm_defconfig b/configs/dra72_evm_defconfig index fa06116..27345f6 100644 --- a/configs/dra72_evm_defconfig +++ b/configs/dra72_evm_defconfig @@ -16,3 +16,4 @@ CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_BAR=y CONFIG_DM_GPIO=y CONFIG_HUSH_PARSER=y +CONFIG_CMD_BOOTZ=y diff --git a/configs/dra7xx_evm_defconfig b/configs/dra7xx_evm_defconfig index 952d146..9778959 100644 --- a/configs/dra7xx_evm_defconfig +++ b/configs/dra7xx_evm_defconfig @@ -11,3 +11,4 @@ CONFIG_SPL_STACK_R_ADDR=0x82000000 CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_BAR=y CONFIG_HUSH_PARSER=y +CONFIG_CMD_BOOTZ=y diff --git a/configs/dra7xx_evm_qspiboot_defconfig b/configs/dra7xx_evm_qspiboot_defconfig index 6de333a..f27fec8 100644 --- a/configs/dra7xx_evm_qspiboot_defconfig +++ b/configs/dra7xx_evm_qspiboot_defconfig @@ -11,3 +11,4 @@ CONFIG_SYS_EXTRA_OPTIONS="QSPI_BOOT" # CONFIG_CMD_NFS is not set CONFIG_SPI_FLASH=y CONFIG_HUSH_PARSER=y +CONFIG_CMD_BOOTZ=y diff --git a/configs/dra7xx_evm_uart3_defconfig b/configs/dra7xx_evm_uart3_defconfig index f4ba4ac..7434db0 100644 --- a/configs/dra7xx_evm_uart3_defconfig +++ b/configs/dra7xx_evm_uart3_defconfig @@ -12,3 +12,4 @@ CONFIG_SYS_EXTRA_OPTIONS="SPL_YMODEM_SUPPORT" # CONFIG_CMD_NFS is not set CONFIG_SPI_FLASH=y CONFIG_HUSH_PARSER=y +CONFIG_CMD_BOOTZ=y diff --git a/configs/draco_defconfig b/configs/draco_defconfig index d2fc98d..955c983 100644 --- a/configs/draco_defconfig +++ b/configs/draco_defconfig @@ -9,3 +9,4 @@ CONFIG_AUTOBOOT_STOP_STR="\x1b\x1b" # CONFIG_CMD_SETEXPR is not set CONFIG_SPI_FLASH=y CONFIG_SYS_PROMPT="U-Boot# " +CONFIG_CMD_BOOTZ=y diff --git a/configs/duovero_defconfig b/configs/duovero_defconfig index 58d86e1..d0eaf05 100644 --- a/configs/duovero_defconfig +++ b/configs/duovero_defconfig @@ -8,3 +8,4 @@ CONFIG_SPL=y # CONFIG_CMD_NFS is not set CONFIG_SYS_PROMPT="duovero # " CONFIG_HUSH_PARSER=y +CONFIG_CMD_BOOTZ=y diff --git a/configs/igep0020_defconfig b/configs/igep0020_defconfig index d1dd75e..245c0c2 100644 --- a/configs/igep0020_defconfig +++ b/configs/igep0020_defconfig @@ -7,3 +7,4 @@ CONFIG_SYS_EXTRA_OPTIONS="MACH_TYPE=MACH_TYPE_IGEP0020,BOOT_ONENAND" # CONFIG_CMD_FLASH is not set # CONFIG_CMD_SETEXPR is not set CONFIG_HUSH_PARSER=y +CONFIG_CMD_BOOTZ=y diff --git a/configs/igep0020_nand_defconfig b/configs/igep0020_nand_defconfig index 4bda465..a0451ac 100644 --- a/configs/igep0020_nand_defconfig +++ b/configs/igep0020_nand_defconfig @@ -7,3 +7,4 @@ CONFIG_SYS_EXTRA_OPTIONS="MACH_TYPE=MACH_TYPE_IGEP0020,BOOT_NAND" # CONFIG_CMD_FLASH is not set # CONFIG_CMD_SETEXPR is not set CONFIG_HUSH_PARSER=y +CONFIG_CMD_BOOTZ=y diff --git a/configs/igep0030_defconfig b/configs/igep0030_defconfig index ebaff74..395540e 100644 --- a/configs/igep0030_defconfig +++ b/configs/igep0030_defconfig @@ -7,3 +7,4 @@ CONFIG_SYS_EXTRA_OPTIONS="MACH_TYPE=MACH_TYPE_IGEP0030,BOOT_ONENAND" # CONFIG_CMD_FLASH is not set # CONFIG_CMD_SETEXPR is not set CONFIG_HUSH_PARSER=y +CONFIG_CMD_BOOTZ=y diff --git a/configs/igep0030_nand_defconfig b/configs/igep0030_nand_defconfig index 85ef454..a7669c5 100644 --- a/configs/igep0030_nand_defconfig +++ b/configs/igep0030_nand_defconfig @@ -7,3 +7,4 @@ CONFIG_SYS_EXTRA_OPTIONS="MACH_TYPE=MACH_TYPE_IGEP0030,BOOT_NAND" # CONFIG_CMD_FLASH is not set # CONFIG_CMD_SETEXPR is not set CONFIG_HUSH_PARSER=y +CONFIG_CMD_BOOTZ=y diff --git a/configs/igep0032_defconfig b/configs/igep0032_defconfig index 37937dc..79d3b25 100644 --- a/configs/igep0032_defconfig +++ b/configs/igep0032_defconfig @@ -7,3 +7,4 @@ CONFIG_SYS_EXTRA_OPTIONS="MACH_TYPE=MACH_TYPE_IGEP0032,BOOT_ONENAND" # CONFIG_CMD_FLASH is not set # CONFIG_CMD_SETEXPR is not set CONFIG_HUSH_PARSER=y +CONFIG_CMD_BOOTZ=y diff --git a/configs/k2e_evm_defconfig b/configs/k2e_evm_defconfig index e1bec71..e12f82e 100644 --- a/configs/k2e_evm_defconfig +++ b/configs/k2e_evm_defconfig @@ -8,3 +8,4 @@ CONFIG_SYS_PROMPT="K2E EVM # " # CONFIG_CMD_FLASH is not set # CONFIG_CMD_SETEXPR is not set CONFIG_SPI_FLASH=y +CONFIG_CMD_BOOTZ=y diff --git a/configs/k2hk_evm_defconfig b/configs/k2hk_evm_defconfig index 6e62326..d472f82 100644 --- a/configs/k2hk_evm_defconfig +++ b/configs/k2hk_evm_defconfig @@ -8,3 +8,4 @@ CONFIG_SYS_PROMPT="K2HK EVM # " # CONFIG_CMD_FLASH is not set # CONFIG_CMD_SETEXPR is not set CONFIG_SPI_FLASH=y +CONFIG_CMD_BOOTZ=y diff --git a/configs/k2l_evm_defconfig b/configs/k2l_evm_defconfig index 8a3f447..2e7d754 100644 --- a/configs/k2l_evm_defconfig +++ b/configs/k2l_evm_defconfig @@ -8,3 +8,4 @@ CONFIG_SYS_PROMPT="K2L EVM # " # CONFIG_CMD_FLASH is not set # CONFIG_CMD_SETEXPR is not set CONFIG_SPI_FLASH=y +CONFIG_CMD_BOOTZ=y diff --git a/configs/omap3_beagle_defconfig b/configs/omap3_beagle_defconfig index e0b8f4f..83adb07 100644 --- a/configs/omap3_beagle_defconfig +++ b/configs/omap3_beagle_defconfig @@ -6,3 +6,4 @@ CONFIG_SYS_EXTRA_OPTIONS="NAND" # CONFIG_CMD_IMLS is not set # CONFIG_CMD_FLASH is not set CONFIG_HUSH_PARSER=y +CONFIG_CMD_BOOTZ=y diff --git a/configs/omap3_overo_defconfig b/configs/omap3_overo_defconfig index 8f7b4de..9f50060 100644 --- a/configs/omap3_overo_defconfig +++ b/configs/omap3_overo_defconfig @@ -10,3 +10,4 @@ CONFIG_SPL=y # CONFIG_CMD_NFS is not set CONFIG_SYS_PROMPT="Overo # " CONFIG_HUSH_PARSER=y +CONFIG_CMD_BOOTZ=y diff --git a/configs/omap3_pandora_defconfig b/configs/omap3_pandora_defconfig index 93dde54..eac4490 100644 --- a/configs/omap3_pandora_defconfig +++ b/configs/omap3_pandora_defconfig @@ -10,3 +10,4 @@ CONFIG_TARGET_OMAP3_PANDORA=y # CONFIG_CMD_NFS is not set CONFIG_SYS_PROMPT="Pandora # " CONFIG_HUSH_PARSER=y +CONFIG_CMD_BOOTZ=y diff --git a/configs/omap3_zoom1_defconfig b/configs/omap3_zoom1_defconfig index 654d94b..da5ed47 100644 --- a/configs/omap3_zoom1_defconfig +++ b/configs/omap3_zoom1_defconfig @@ -7,3 +7,4 @@ CONFIG_TARGET_OMAP3_ZOOM1=y # CONFIG_CMD_FPGA is not set # CONFIG_CMD_SETEXPR is not set CONFIG_HUSH_PARSER=y +CONFIG_CMD_BOOTZ=y diff --git a/configs/omap4_panda_defconfig b/configs/omap4_panda_defconfig index 0683fe2..3c95c05 100644 --- a/configs/omap4_panda_defconfig +++ b/configs/omap4_panda_defconfig @@ -7,3 +7,4 @@ CONFIG_SPL=y # CONFIG_CMD_SETEXPR is not set # CONFIG_CMD_NFS is not set CONFIG_HUSH_PARSER=y +CONFIG_CMD_BOOTZ=y diff --git a/configs/omap4_sdp4430_defconfig b/configs/omap4_sdp4430_defconfig index 248863f..81b3eb2 100644 --- a/configs/omap4_sdp4430_defconfig +++ b/configs/omap4_sdp4430_defconfig @@ -8,3 +8,4 @@ CONFIG_HUSH_PARSER=y # CONFIG_CMD_SETEXPR is not set # CONFIG_CMD_NET is not set # CONFIG_CMD_NFS is not set +CONFIG_CMD_BOOTZ=y diff --git a/configs/omap5_uevm_defconfig b/configs/omap5_uevm_defconfig index 338d62c..5cde3b0 100644 --- a/configs/omap5_uevm_defconfig +++ b/configs/omap5_uevm_defconfig @@ -6,3 +6,4 @@ CONFIG_SPL=y # CONFIG_CMD_FLASH is not set # CONFIG_CMD_SETEXPR is not set CONFIG_HUSH_PARSER=y +CONFIG_CMD_BOOTZ=y diff --git a/configs/pcm051_rev1_defconfig b/configs/pcm051_rev1_defconfig index aaf4632..76662a2 100644 --- a/configs/pcm051_rev1_defconfig +++ b/configs/pcm051_rev1_defconfig @@ -7,3 +7,4 @@ CONFIG_SYS_EXTRA_OPTIONS="REV1" # CONFIG_CMD_SETEXPR is not set CONFIG_SPI_FLASH=y CONFIG_HUSH_PARSER=y +CONFIG_CMD_BOOTZ=y diff --git a/configs/pcm051_rev3_defconfig b/configs/pcm051_rev3_defconfig index e02780c..1168ade 100644 --- a/configs/pcm051_rev3_defconfig +++ b/configs/pcm051_rev3_defconfig @@ -7,3 +7,4 @@ CONFIG_SYS_EXTRA_OPTIONS="REV3" # CONFIG_CMD_SETEXPR is not set CONFIG_SPI_FLASH=y CONFIG_HUSH_PARSER=y +CONFIG_CMD_BOOTZ=y diff --git a/configs/pengwyn_defconfig b/configs/pengwyn_defconfig index 3fdadde..7322be7 100644 --- a/configs/pengwyn_defconfig +++ b/configs/pengwyn_defconfig @@ -5,3 +5,4 @@ CONFIG_SPL=y # CONFIG_CMD_FLASH is not set # CONFIG_CMD_SETEXPR is not set CONFIG_HUSH_PARSER=y +CONFIG_CMD_BOOTZ=y diff --git a/configs/pepper_defconfig b/configs/pepper_defconfig index 300c147..a01a873 100644 --- a/configs/pepper_defconfig +++ b/configs/pepper_defconfig @@ -6,3 +6,4 @@ CONFIG_SPL=y # CONFIG_CMD_SETEXPR is not set CONFIG_SYS_PROMPT="pepper# " CONFIG_HUSH_PARSER=y +CONFIG_CMD_BOOTZ=y diff --git a/configs/pxm2_defconfig b/configs/pxm2_defconfig index 41c2849..c0d54d4 100644 --- a/configs/pxm2_defconfig +++ b/configs/pxm2_defconfig @@ -9,3 +9,4 @@ CONFIG_AUTOBOOT_STOP_STR="\x1b\x1b" # CONFIG_CMD_SETEXPR is not set CONFIG_SPI_FLASH=y CONFIG_SYS_PROMPT="U-Boot# " +CONFIG_CMD_BOOTZ=y diff --git a/configs/rastaban_defconfig b/configs/rastaban_defconfig index 7a3ac70..19d0905 100644 --- a/configs/rastaban_defconfig +++ b/configs/rastaban_defconfig @@ -9,3 +9,4 @@ CONFIG_AUTOBOOT_STOP_STR="\x1b\x1b" # CONFIG_CMD_SETEXPR is not set CONFIG_SPI_FLASH=y CONFIG_SYS_PROMPT="U-Boot# " +CONFIG_CMD_BOOTZ=y diff --git a/configs/rut_defconfig b/configs/rut_defconfig index 774957c..9639a26 100644 --- a/configs/rut_defconfig +++ b/configs/rut_defconfig @@ -9,3 +9,4 @@ CONFIG_AUTOBOOT_STOP_STR="\x1b\x1b" # CONFIG_CMD_SETEXPR is not set CONFIG_SPI_FLASH=y CONFIG_SYS_PROMPT="U-Boot# " +CONFIG_CMD_BOOTZ=y diff --git a/configs/thuban_defconfig b/configs/thuban_defconfig index e2a6b0c..8a42645 100644 --- a/configs/thuban_defconfig +++ b/configs/thuban_defconfig @@ -9,3 +9,4 @@ CONFIG_AUTOBOOT_STOP_STR="\x1b\x1b" # CONFIG_CMD_SETEXPR is not set CONFIG_SPI_FLASH=y CONFIG_SYS_PROMPT="U-Boot# " +CONFIG_CMD_BOOTZ=y diff --git a/include/config_distro_defaults.h b/include/config_distro_defaults.h index 7503bff..e12dc4e 100644 --- a/include/config_distro_defaults.h +++ b/include/config_distro_defaults.h @@ -46,8 +46,10 @@ #ifdef CONFIG_ARM64 #define CONFIG_CMD_BOOTI #else +#ifndef CONFIG_CMD_BOOTZ #define CONFIG_CMD_BOOTZ #endif +#endif #define CONFIG_CMD_DHCP #define CONFIG_CMD_ELF #define CONFIG_CMD_EXT2 diff --git a/include/configs/cm_t35.h b/include/configs/cm_t35.h index 3ff138f..e9370ab 100644 --- a/include/configs/cm_t35.h +++ b/include/configs/cm_t35.h @@ -199,7 +199,6 @@ "nand read ${loadaddr} 2a0000 400000; " \ "bootm ${loadaddr}\0" \
-#define CONFIG_CMD_BOOTZ #define CONFIG_BOOTCOMMAND \ "mmc dev ${mmcdev}; if mmc rescan; then " \ "if run loadbootscript; then " \ diff --git a/include/configs/devkit8000.h b/include/configs/devkit8000.h index 6d2c22e..6665f6f 100644 --- a/include/configs/devkit8000.h +++ b/include/configs/devkit8000.h @@ -103,7 +103,6 @@ #undef CONFIG_CMD_SPI #undef CONFIG_CMD_GPIO #undef CONFIG_CMD_ASKENV -#undef CONFIG_CMD_BOOTZ #undef CONFIG_SUPPORT_RAW_INITRD #undef CONFIG_FAT_WRITE #undef CONFIG_CMD_EXT4 diff --git a/include/configs/ti_armv7_common.h b/include/configs/ti_armv7_common.h index 6dde989..489c2fb 100644 --- a/include/configs/ti_armv7_common.h +++ b/include/configs/ti_armv7_common.h @@ -147,7 +147,6 @@ #endif
#define CONFIG_CMD_ASKENV -#define CONFIG_CMD_BOOTZ #define CONFIG_SUPPORT_RAW_INITRD
/*