diff options
| author | Heiko Schocher <hs@denx.de> | 2016-09-09 08:12:49 +0200 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2016-09-09 18:14:18 -0400 |
| commit | 9dd1d0aa4e086bc8a5eaf19a67825c3323c41c5a (patch) | |
| tree | 1c25f0f63a55fea935a8013b50dd5b9c8609889d | |
| parent | 12f05678e157ef4472b4e3611bb7ae9751487ff0 (diff) | |
common, kconfig: move VERSION_VARIABLE to Kconfig
move VERSION_VARIABLE from board config file into a
Kconfig option.
Signed-off-by: Heiko Schocher <hs@denx.de>
270 files changed, 222 insertions, 73 deletions
diff --git a/common/Kconfig b/common/Kconfig index 44941127442..63c4a672637 100644 --- a/common/Kconfig +++ b/common/Kconfig @@ -203,3 +203,13 @@ config SYS_NO_FLASH default n help This option is used to disable support for parallel NOR flash. + +config VERSION_VARIABLE + bool "add U-Boot environment variable vers" + default n + help + If this variable is defined, an environment variable + named "ver" is created by U-Boot showing the U-Boot + version as printed by the "version" command. + Any change to this variable will be reverted at the + next reset. diff --git a/configs/10m50_defconfig b/configs/10m50_defconfig index 15952af1c8a..05fad1e7166 100644 --- a/configs/10m50_defconfig +++ b/configs/10m50_defconfig @@ -1,10 +1,9 @@ CONFIG_NIOS2=y CONFIG_SYS_CONFIG_NAME="10m50_devboard" -CONFIG_DM_SERIAL=y -CONFIG_DM_GPIO=y CONFIG_DEFAULT_DEVICE_TREE="10m50_devboard" CONFIG_FIT=y CONFIG_OF_BOARD_SETUP=y +CONFIG_VERSION_VARIABLE=y CONFIG_HUSH_PARSER=y # CONFIG_AUTOBOOT is not set CONFIG_CMD_CPU=y @@ -19,6 +18,7 @@ CONFIG_CMD_DHCP=y CONFIG_CMD_MII=y CONFIG_CMD_PING=y CONFIG_NET_RANDOM_ETHADDR=y +CONFIG_DM_GPIO=y CONFIG_ALTERA_PIO=y CONFIG_MISC=y CONFIG_ALTERA_SYSID=y @@ -26,6 +26,7 @@ CONFIG_MTD=y CONFIG_ALTERA_QSPI=y CONFIG_DM_ETH=y CONFIG_ALTERA_TSE=y +CONFIG_DM_SERIAL=y CONFIG_SYS_NS16550=y CONFIG_TIMER=y CONFIG_ALTERA_TIMER=y diff --git a/configs/3c120_defconfig b/configs/3c120_defconfig index b19c9564854..dc0d74a3a65 100644 --- a/configs/3c120_defconfig +++ b/configs/3c120_defconfig @@ -1,10 +1,9 @@ CONFIG_NIOS2=y CONFIG_SYS_CONFIG_NAME="3c120_devboard" -CONFIG_DM_SERIAL=y -CONFIG_DM_GPIO=y CONFIG_DEFAULT_DEVICE_TREE="3c120_devboard" CONFIG_FIT=y CONFIG_OF_BOARD_SETUP=y +CONFIG_VERSION_VARIABLE=y CONFIG_HUSH_PARSER=y # CONFIG_AUTOBOOT is not set CONFIG_CMD_CPU=y @@ -19,6 +18,7 @@ CONFIG_CMD_DHCP=y CONFIG_CMD_MII=y CONFIG_CMD_PING=y CONFIG_NET_RANDOM_ETHADDR=y +CONFIG_DM_GPIO=y CONFIG_ALTERA_PIO=y CONFIG_MISC=y CONFIG_ALTERA_SYSID=y @@ -26,6 +26,7 @@ CONFIG_MTD=y CONFIG_CFI_FLASH=y CONFIG_DM_ETH=y CONFIG_ALTERA_TSE=y +CONFIG_DM_SERIAL=y CONFIG_ALTERA_JTAG_UART=y CONFIG_ALTERA_JTAG_UART_BYPASS=y CONFIG_TIMER=y diff --git a/configs/CPCI2DP_defconfig b/configs/CPCI2DP_defconfig index 99e4ad007d1..470e0704412 100644 --- a/configs/CPCI2DP_defconfig +++ b/configs/CPCI2DP_defconfig @@ -2,6 +2,7 @@ CONFIG_PPC=y CONFIG_4xx=y CONFIG_TARGET_CPCI2DP=y CONFIG_BOOTDELAY=3 +CONFIG_VERSION_VARIABLE=y CONFIG_LOOPW=y CONFIG_CMD_I2C=y # CONFIG_CMD_SETEXPR is not set diff --git a/configs/CPCI4052_defconfig b/configs/CPCI4052_defconfig index d7c71c1a990..32e1cb1bbb2 100644 --- a/configs/CPCI4052_defconfig +++ b/configs/CPCI4052_defconfig @@ -3,6 +3,7 @@ CONFIG_4xx=y CONFIG_TARGET_CPCI4052=y CONFIG_OF_BOARD_SETUP=y CONFIG_BOOTDELAY=3 +CONFIG_VERSION_VARIABLE=y CONFIG_AUTOBOOT_KEYED=y CONFIG_AUTOBOOT_PROMPT="Press SPACE to abort autoboot in %d seconds\n" CONFIG_AUTOBOOT_STOP_STR=" " diff --git a/configs/MigoR_defconfig b/configs/MigoR_defconfig index 129403c34ab..3a2b9bb5e04 100644 --- a/configs/MigoR_defconfig +++ b/configs/MigoR_defconfig @@ -1,6 +1,7 @@ CONFIG_SH=y CONFIG_TARGET_MIGOR=y CONFIG_BOOTDELAY=3 +CONFIG_VERSION_VARIABLE=y # CONFIG_CMD_BDI is not set # CONFIG_CMD_CONSOLE is not set # CONFIG_CMD_BOOTD is not set diff --git a/configs/PLU405_defconfig b/configs/PLU405_defconfig index e9dfd3b07da..e84a88e44b9 100644 --- a/configs/PLU405_defconfig +++ b/configs/PLU405_defconfig @@ -3,6 +3,7 @@ CONFIG_4xx=y CONFIG_TARGET_PLU405=y CONFIG_OF_BOARD_SETUP=y CONFIG_BOOTDELAY=3 +CONFIG_VERSION_VARIABLE=y CONFIG_AUTOBOOT_KEYED=y CONFIG_AUTOBOOT_PROMPT="Press SPACE to abort autoboot in %d seconds\n" CONFIG_AUTOBOOT_STOP_STR=" " diff --git a/configs/PMC405DE_defconfig b/configs/PMC405DE_defconfig index cdb82d64486..8f1410e2dd9 100644 --- a/configs/PMC405DE_defconfig +++ b/configs/PMC405DE_defconfig @@ -3,6 +3,7 @@ CONFIG_4xx=y CONFIG_TARGET_PMC405DE=y CONFIG_OF_BOARD_SETUP=y CONFIG_BOOTDELAY=3 +CONFIG_VERSION_VARIABLE=y CONFIG_AUTOBOOT_KEYED=y CONFIG_AUTOBOOT_PROMPT="Press SPACE to abort autoboot in %d seconds\n" CONFIG_AUTOBOOT_STOP_STR=" " diff --git a/configs/PMC440_defconfig b/configs/PMC440_defconfig index 552fdd25fad..af38882cc1e 100644 --- a/configs/PMC440_defconfig +++ b/configs/PMC440_defconfig @@ -3,6 +3,7 @@ CONFIG_4xx=y CONFIG_TARGET_PMC440=y CONFIG_OF_BOARD_SETUP=y CONFIG_BOOTDELAY=3 +CONFIG_VERSION_VARIABLE=y CONFIG_AUTOBOOT_KEYED=y CONFIG_AUTOBOOT_PROMPT="Press SPACE to abort autoboot in %d seconds\n" CONFIG_AUTOBOOT_STOP_STR=" " diff --git a/configs/VOM405_defconfig b/configs/VOM405_defconfig index 800731b18e0..82446e085b1 100644 --- a/configs/VOM405_defconfig +++ b/configs/VOM405_defconfig @@ -3,6 +3,7 @@ CONFIG_4xx=y CONFIG_TARGET_VOM405=y CONFIG_OF_BOARD_SETUP=y CONFIG_BOOTDELAY=3 +CONFIG_VERSION_VARIABLE=y CONFIG_CMD_I2C=y # CONFIG_CMD_SETEXPR is not set CONFIG_CMD_DHCP=y diff --git a/configs/acadia_defconfig b/configs/acadia_defconfig index 92b14d07734..e29431c34b2 100644 --- a/configs/acadia_defconfig +++ b/configs/acadia_defconfig @@ -3,6 +3,7 @@ CONFIG_4xx=y CONFIG_TARGET_ACADIA=y CONFIG_OF_BOARD_SETUP=y CONFIG_BOOTDELAY=5 +CONFIG_VERSION_VARIABLE=y CONFIG_HUSH_PARSER=y CONFIG_CMD_ASKENV=y CONFIG_CMD_GREPENV=y diff --git a/configs/alt_defconfig b/configs/alt_defconfig index f1e7bf18b7a..bc310b495d7 100644 --- a/configs/alt_defconfig +++ b/configs/alt_defconfig @@ -6,6 +6,7 @@ CONFIG_BOOTSTAGE_USER_COUNT=0x20 CONFIG_BOOTSTAGE_STASH_ADDR=0x0 CONFIG_BOOTSTAGE_STASH_SIZE=0x4096 CONFIG_BOOTDELAY=3 +CONFIG_VERSION_VARIABLE=y CONFIG_CMD_BOOTZ=y # CONFIG_CMD_IMI is not set # CONFIG_CMD_IMLS is not set diff --git a/configs/am335x_baltos_defconfig b/configs/am335x_baltos_defconfig index 56453a4bb03..9b0f7bc2ba2 100644 --- a/configs/am335x_baltos_defconfig +++ b/configs/am335x_baltos_defconfig @@ -7,6 +7,7 @@ CONFIG_FIT=y CONFIG_FIT_VERBOSE=y CONFIG_OF_BOARD_SETUP=y CONFIG_SYS_EXTRA_OPTIONS="NAND" +CONFIG_VERSION_VARIABLE=y CONFIG_HUSH_PARSER=y CONFIG_CMD_BOOTZ=y # CONFIG_CMD_IMLS is not set diff --git a/configs/am335x_boneblack_defconfig b/configs/am335x_boneblack_defconfig index cf3ba50f43b..b4e2a1c443c 100644 --- a/configs/am335x_boneblack_defconfig +++ b/configs/am335x_boneblack_defconfig @@ -5,6 +5,7 @@ CONFIG_SPL=y CONFIG_SPL_STACK_R=y CONFIG_FIT=y CONFIG_SYS_EXTRA_OPTIONS="EMMC_BOOT" +CONFIG_VERSION_VARIABLE=y CONFIG_HUSH_PARSER=y CONFIG_AUTOBOOT_KEYED=y CONFIG_AUTOBOOT_PROMPT="Press SPACE to abort autoboot in %d seconds\n" diff --git a/configs/am335x_boneblack_vboot_defconfig b/configs/am335x_boneblack_vboot_defconfig index e1525b486ab..2c124025c28 100644 --- a/configs/am335x_boneblack_vboot_defconfig +++ b/configs/am335x_boneblack_vboot_defconfig @@ -8,6 +8,7 @@ CONFIG_FIT=y CONFIG_FIT_VERBOSE=y CONFIG_FIT_SIGNATURE=y CONFIG_SYS_EXTRA_OPTIONS="EMMC_BOOT,ENABLE_VBOOT" +CONFIG_VERSION_VARIABLE=y CONFIG_HUSH_PARSER=y CONFIG_AUTOBOOT_KEYED=y CONFIG_AUTOBOOT_PROMPT="Press SPACE to abort autoboot in %d seconds\n" diff --git a/configs/am335x_evm_defconfig b/configs/am335x_evm_defconfig index 7c90c5a9f1a..65a90029ac1 100644 --- a/configs/am335x_evm_defconfig +++ b/configs/am335x_evm_defconfig @@ -7,6 +7,7 @@ CONFIG_SPL_STACK_R=y CONFIG_FIT=y CONFIG_SYS_EXTRA_OPTIONS="NAND" CONFIG_SPL_LOAD_FIT=y +CONFIG_VERSION_VARIABLE=y CONFIG_HUSH_PARSER=y CONFIG_CMD_BOOTZ=y # CONFIG_CMD_IMLS is not set diff --git a/configs/am335x_evm_nor_defconfig b/configs/am335x_evm_nor_defconfig index dcc0033d4ce..74577fac5d8 100644 --- a/configs/am335x_evm_nor_defconfig +++ b/configs/am335x_evm_nor_defconfig @@ -6,6 +6,7 @@ CONFIG_SPL=y CONFIG_SPL_STACK_R=y CONFIG_FIT=y CONFIG_SYS_EXTRA_OPTIONS="NAND" +CONFIG_VERSION_VARIABLE=y CONFIG_HUSH_PARSER=y CONFIG_CMD_BOOTZ=y # CONFIG_CMD_IMLS is not set diff --git a/configs/am335x_evm_norboot_defconfig b/configs/am335x_evm_norboot_defconfig index 0b1161eb3f1..98da63ff6f3 100644 --- a/configs/am335x_evm_norboot_defconfig +++ b/configs/am335x_evm_norboot_defconfig @@ -3,6 +3,7 @@ CONFIG_TARGET_AM335X_EVM=y CONFIG_NOR=y CONFIG_FIT=y CONFIG_NOR_BOOT=y +CONFIG_VERSION_VARIABLE=y CONFIG_HUSH_PARSER=y CONFIG_CMD_BOOTZ=y # CONFIG_CMD_IMLS is not set diff --git a/configs/am335x_evm_spiboot_defconfig b/configs/am335x_evm_spiboot_defconfig index 542bdb74e26..af4fac32106 100644 --- a/configs/am335x_evm_spiboot_defconfig +++ b/configs/am335x_evm_spiboot_defconfig @@ -6,6 +6,7 @@ CONFIG_SPL_STACK_R=y CONFIG_FIT=y CONFIG_SYS_EXTRA_OPTIONS="SPI_BOOT" CONFIG_SPI_BOOT=y +CONFIG_VERSION_VARIABLE=y CONFIG_HUSH_PARSER=y CONFIG_CMD_BOOTZ=y # CONFIG_CMD_IMLS is not set diff --git a/configs/am335x_evm_usbspl_defconfig b/configs/am335x_evm_usbspl_defconfig index 7884e84b4b6..f8f7c7e33dc 100644 --- a/configs/am335x_evm_usbspl_defconfig +++ b/configs/am335x_evm_usbspl_defconfig @@ -5,6 +5,7 @@ CONFIG_SPL=y CONFIG_SPL_STACK_R=y CONFIG_FIT=y CONFIG_SYS_EXTRA_OPTIONS="NAND,SPL_USBETH_SUPPORT" +CONFIG_VERSION_VARIABLE=y CONFIG_HUSH_PARSER=y CONFIG_CMD_BOOTZ=y # CONFIG_CMD_IMLS is not set diff --git a/configs/am335x_igep0033_defconfig b/configs/am335x_igep0033_defconfig index d6022a30008..efa3a9c6459 100644 --- a/configs/am335x_igep0033_defconfig +++ b/configs/am335x_igep0033_defconfig @@ -3,6 +3,7 @@ CONFIG_TARGET_AM335X_IGEP0033=y CONFIG_SPL_STACK_R_ADDR=0x82000000 CONFIG_SPL=y CONFIG_SPL_STACK_R=y +CONFIG_VERSION_VARIABLE=y CONFIG_HUSH_PARSER=y CONFIG_CMD_BOOTZ=y # CONFIG_CMD_IMLS is not set diff --git a/configs/am335x_shc_defconfig b/configs/am335x_shc_defconfig index c83311fd578..be9a99ea358 100644 --- a/configs/am335x_shc_defconfig +++ b/configs/am335x_shc_defconfig @@ -5,6 +5,7 @@ CONFIG_SPL_STACK_R_ADDR=0x82000000 CONFIG_SPL=y CONFIG_SPL_STACK_R=y CONFIG_FIT=y +CONFIG_VERSION_VARIABLE=y CONFIG_HUSH_PARSER=y CONFIG_SYS_PROMPT="U-Boot# " CONFIG_AUTOBOOT_KEYED=y diff --git a/configs/am335x_shc_ict_defconfig b/configs/am335x_shc_ict_defconfig index bfb56b2edd2..8d6c8d9bed1 100644 --- a/configs/am335x_shc_ict_defconfig +++ b/configs/am335x_shc_ict_defconfig @@ -6,6 +6,7 @@ CONFIG_SPL_STACK_R_ADDR=0x82000000 CONFIG_SPL=y CONFIG_SPL_STACK_R=y CONFIG_FIT=y +CONFIG_VERSION_VARIABLE=y CONFIG_SYS_PROMPT="U-Boot# " CONFIG_AUTOBOOT_KEYED=y CONFIG_AUTOBOOT_PROMPT="Enter 'shc' to enter prompt (times out) %d \nEnter 'noautoboot' to enter prompt without timeout\n" diff --git a/configs/am335x_shc_netboot_defconfig b/configs/am335x_shc_netboot_defconfig index d16c5f054a2..2e70a51f86c 100644 --- a/configs/am335x_shc_netboot_defconfig +++ b/configs/am335x_shc_netboot_defconfig @@ -6,6 +6,7 @@ CONFIG_SPL_STACK_R_ADDR=0x82000000 CONFIG_SPL=y CONFIG_SPL_STACK_R=y CONFIG_FIT=y +CONFIG_VERSION_VARIABLE=y CONFIG_SYS_PROMPT="U-Boot# " CONFIG_AUTOBOOT_KEYED=y CONFIG_AUTOBOOT_PROMPT="Enter 'shc' to enter prompt (times out) %d \nEnter 'noautoboot' to enter prompt without timeout\n" diff --git a/configs/am335x_shc_prompt_defconfig b/configs/am335x_shc_prompt_defconfig index b9bc355d8c3..764fc9f23d6 100644 --- a/configs/am335x_shc_prompt_defconfig +++ b/configs/am335x_shc_prompt_defconfig @@ -5,6 +5,7 @@ CONFIG_SPL_STACK_R_ADDR=0x82000000 CONFIG_SPL=y CONFIG_SPL_STACK_R=y CONFIG_FIT=y +CONFIG_VERSION_VARIABLE=y CONFIG_AUTOBOOT_KEYED=y CONFIG_AUTOBOOT_PROMPT="Enter 'shc' to enter prompt (times out) %d \nEnter 'noautoboot' to enter prompt without timeout\n" CONFIG_AUTOBOOT_DELAY_STR="shc" diff --git a/configs/am335x_shc_sdboot_defconfig b/configs/am335x_shc_sdboot_defconfig index b0e8eff0f79..ba77c2d054b 100644 --- a/configs/am335x_shc_sdboot_defconfig +++ b/configs/am335x_shc_sdboot_defconfig @@ -6,6 +6,7 @@ CONFIG_SPL_STACK_R_ADDR=0x82000000 CONFIG_SPL=y CONFIG_SPL_STACK_R=y CONFIG_FIT=y +CONFIG_VERSION_VARIABLE=y CONFIG_SYS_PROMPT="U-Boot# " CONFIG_AUTOBOOT_KEYED=y CONFIG_AUTOBOOT_PROMPT="Enter 'shc' to enter prompt (times out) %d \nEnter 'noautoboot' to enter prompt without timeout\n" diff --git a/configs/am335x_shc_sdboot_prompt_defconfig b/configs/am335x_shc_sdboot_prompt_defconfig index b0e8eff0f79..ba77c2d054b 100644 --- a/configs/am335x_shc_sdboot_prompt_defconfig +++ b/configs/am335x_shc_sdboot_prompt_defconfig @@ -6,6 +6,7 @@ CONFIG_SPL_STACK_R_ADDR=0x82000000 CONFIG_SPL=y CONFIG_SPL_STACK_R=y CONFIG_FIT=y +CONFIG_VERSION_VARIABLE=y CONFIG_SYS_PROMPT="U-Boot# " CONFIG_AUTOBOOT_KEYED=y CONFIG_AUTOBOOT_PROMPT="Enter 'shc' to enter prompt (times out) %d \nEnter 'noautoboot' to enter prompt without timeout\n" diff --git a/configs/am335x_sl50_defconfig b/configs/am335x_sl50_defconfig index 01c1eeb14ee..dae8f1b39a2 100644 --- a/configs/am335x_sl50_defconfig +++ b/configs/am335x_sl50_defconfig @@ -5,6 +5,7 @@ CONFIG_SPL=y CONFIG_SPL_STACK_R=y CONFIG_FIT=y CONFIG_SYS_EXTRA_OPTIONS="EMMC_BOOT" +CONFIG_VERSION_VARIABLE=y CONFIG_HUSH_PARSER=y # CONFIG_AUTOBOOT is not set CONFIG_CMD_BOOTZ=y diff --git a/configs/am3517_evm_defconfig b/configs/am3517_evm_defconfig index 292b776e070..d5a0e30afc8 100644 --- a/configs/am3517_evm_defconfig +++ b/configs/am3517_evm_defconfig @@ -5,6 +5,7 @@ CONFIG_SPL=y CONFIG_FIT=y CONFIG_SYS_EXTRA_OPTIONS="NAND" CONFIG_BOOTDELAY=10 +CONFIG_VERSION_VARIABLE=y CONFIG_HUSH_PARSER=y CONFIG_SYS_PROMPT="AM3517_EVM # " CONFIG_CMD_BOOTZ=y diff --git a/configs/am43xx_evm_defconfig b/configs/am43xx_evm_defconfig index 51800cd05fd..c465411be49 100644 --- a/configs/am43xx_evm_defconfig +++ b/configs/am43xx_evm_defconfig @@ -8,6 +8,7 @@ CONFIG_SPL_STACK_R=y CONFIG_FIT=y CONFIG_SYS_EXTRA_OPTIONS="CONS_INDEX=1,NAND" CONFIG_SPL_LOAD_FIT=y +CONFIG_VERSION_VARIABLE=y CONFIG_HUSH_PARSER=y CONFIG_CMD_BOOTZ=y # CONFIG_CMD_IMLS is not set diff --git a/configs/am43xx_evm_ethboot_defconfig b/configs/am43xx_evm_ethboot_defconfig index a980c994cf6..8676f321c24 100644 --- a/configs/am43xx_evm_ethboot_defconfig +++ b/configs/am43xx_evm_ethboot_defconfig @@ -3,6 +3,7 @@ CONFIG_AM43XX=y CONFIG_TARGET_AM43XX_EVM=y CONFIG_SPL=y CONFIG_SYS_EXTRA_OPTIONS="SERIAL1,CONS_INDEX=1,NAND,SPL_ETH_SUPPORT" +CONFIG_VERSION_VARIABLE=y CONFIG_HUSH_PARSER=y CONFIG_CMD_BOOTZ=y # CONFIG_CMD_IMLS is not set diff --git a/configs/am43xx_evm_qspiboot_defconfig b/configs/am43xx_evm_qspiboot_defconfig index 7335971f508..26872c234f4 100644 --- a/configs/am43xx_evm_qspiboot_defconfig +++ b/configs/am43xx_evm_qspiboot_defconfig @@ -4,6 +4,7 @@ CONFIG_TARGET_AM43XX_EVM=y CONFIG_ISW_ENTRY_ADDR=0x30000000 CONFIG_SYS_EXTRA_OPTIONS="SERIAL1,CONS_INDEX=1,QSPI,QSPI_BOOT" CONFIG_QSPI_BOOT=y +CONFIG_VERSION_VARIABLE=y CONFIG_HUSH_PARSER=y CONFIG_CMD_BOOTZ=y # CONFIG_CMD_IMLS is not set diff --git a/configs/am43xx_evm_usbhost_boot_defconfig b/configs/am43xx_evm_usbhost_boot_defconfig index 8d4df7fca30..d8a23c51027 100644 --- a/configs/am43xx_evm_usbhost_boot_defconfig +++ b/configs/am43xx_evm_usbhost_boot_defconfig @@ -9,6 +9,7 @@ CONFIG_SPL_STACK_R=y CONFIG_FIT=y CONFIG_SYS_EXTRA_OPTIONS="SERIAL1,CONS_INDEX=1,NAND,SPL_USB_HOST_SUPPORT" CONFIG_SPL_LOAD_FIT=y +CONFIG_VERSION_VARIABLE=y CONFIG_HUSH_PARSER=y CONFIG_CMD_BOOTZ=y # CONFIG_CMD_IMLS is not set diff --git a/configs/am43xx_hs_evm_defconfig b/configs/am43xx_hs_evm_defconfig index 9d101cce8ad..9494860d912 100644 --- a/configs/am43xx_hs_evm_defconfig +++ b/configs/am43xx_hs_evm_defconfig @@ -12,6 +12,7 @@ CONFIG_SYS_EXTRA_OPTIONS="CONS_INDEX=1, NAND" CONFIG_SPL_LOAD_FIT=y CONFIG_SPL_FIT_IMAGE_POST_PROCESS=y CONFIG_FIT_IMAGE_POST_PROCESS=y +CONFIG_VERSION_VARIABLE=y CONFIG_HUSH_PARSER=y CONFIG_CMD_BOOTZ=y # CONFIG_CMD_IMLS is not set diff --git a/configs/am57xx_evm_defconfig b/configs/am57xx_evm_defconfig index c58296a6b76..d49129d42a3 100644 --- a/configs/am57xx_evm_defconfig +++ b/configs/am57xx_evm_defconfig @@ -8,6 +8,7 @@ CONFIG_SPL_STACK_R=y CONFIG_FIT=y CONFIG_OF_BOARD_SETUP=y CONFIG_SPL_LOAD_FIT=y +CONFIG_VERSION_VARIABLE=y CONFIG_HUSH_PARSER=y CONFIG_CMD_BOOTZ=y # CONFIG_CMD_IMLS is not set diff --git a/configs/am57xx_evm_nodt_defconfig b/configs/am57xx_evm_nodt_defconfig index fb0c6bc3ab0..0066691e8d1 100644 --- a/configs/am57xx_evm_nodt_defconfig +++ b/configs/am57xx_evm_nodt_defconfig @@ -2,6 +2,7 @@ CONFIG_ARM=y CONFIG_OMAP54XX=y CONFIG_TARGET_AM57XX_EVM=y CONFIG_SPL=y +CONFIG_VERSION_VARIABLE=y CONFIG_HUSH_PARSER=y CONFIG_CMD_BOOTZ=y # CONFIG_CMD_IMLS is not set diff --git a/configs/am57xx_hs_evm_defconfig b/configs/am57xx_hs_evm_defconfig index 80936bf0a67..86f7373a0d6 100644 --- a/configs/am57xx_hs_evm_defconfig +++ b/configs/am57xx_hs_evm_defconfig @@ -11,6 +11,7 @@ CONFIG_OF_BOARD_SETUP=y CONFIG_SPL_LOAD_FIT=y CONFIG_SPL_FIT_IMAGE_POST_PROCESS=y CONFIG_FIT_IMAGE_POST_PROCESS=y +CONFIG_VERSION_VARIABLE=y CONFIG_HUSH_PARSER=y CONFIG_CMD_BOOTZ=y # CONFIG_CMD_IMLS is not set diff --git a/configs/ap325rxa_defconfig b/configs/ap325rxa_defconfig index 51a48de877d..818eb41bd17 100644 --- a/configs/ap325rxa_defconfig +++ b/configs/ap325rxa_defconfig @@ -1,6 +1,7 @@ CONFIG_SH=y CONFIG_TARGET_AP325RXA=y CONFIG_BOOTDELAY=3 +CONFIG_VERSION_VARIABLE=y # CONFIG_CMD_BDI is not set # CONFIG_CMD_CONSOLE is not set # CONFIG_CMD_BOOTD is not set diff --git a/configs/ap_sh4a_4a_defconfig b/configs/ap_sh4a_4a_defconfig index 73e6f04a315..ee14e9624ef 100644 --- a/configs/ap_sh4a_4a_defconfig +++ b/configs/ap_sh4a_4a_defconfig @@ -1,6 +1,7 @@ CONFIG_SH=y CONFIG_TARGET_AP_SH4A_4A=y CONFIG_BOOTDELAY=3 +CONFIG_VERSION_VARIABLE=y # CONFIG_CMD_BDI is not set # CONFIG_CMD_CONSOLE is not set # CONFIG_CMD_BOOTD is not set diff --git a/configs/apf27_defconfig b/configs/apf27_defconfig index a175274b24d..3f24da93e15 100644 --- a/configs/apf27_defconfig +++ b/configs/apf27_defconfig @@ -2,6 +2,7 @@ CONFIG_ARM=y CONFIG_TARGET_APF27=y CONFIG_SPL=y CONFIG_BOOTDELAY=5 +CONFIG_VERSION_VARIABLE=y CONFIG_HUSH_PARSER=y CONFIG_SYS_PROMPT="BIOS> " # CONFIG_CMD_IMLS is not set diff --git a/configs/apx4devkit_defconfig b/configs/apx4devkit_defconfig index 6d364e7e0dd..01d8190ffc4 100644 --- a/configs/apx4devkit_defconfig +++ b/configs/apx4devkit_defconfig @@ -2,6 +2,7 @@ CONFIG_ARM=y CONFIG_TARGET_APX4DEVKIT=y CONFIG_SPL=y CONFIG_BOOTDELAY=1 +CONFIG_VERSION_VARIABLE=y CONFIG_HUSH_PARSER=y # CONFIG_CMD_IMLS is not set # CONFIG_CMD_FLASH is not set diff --git a/configs/arches_defconfig b/configs/arches_defconfig index d97715b4b5d..e367cd9a112 100644 --- a/configs/arches_defconfig +++ b/configs/arches_defconfig @@ -5,6 +5,7 @@ CONFIG_ARCHES=y CONFIG_DEFAULT_DEVICE_TREE="arches" CONFIG_OF_BOARD_SETUP=y CONFIG_BOOTDELAY=5 +CONFIG_VERSION_VARIABLE=y CONFIG_HUSH_PARSER=y CONFIG_CMD_ASKENV=y CONFIG_CMD_GREPENV=y diff --git a/configs/armadillo-800eva_defconfig b/configs/armadillo-800eva_defconfig index 3bd4680a28a..7d0a592d782 100644 --- a/configs/armadillo-800eva_defconfig +++ b/configs/armadillo-800eva_defconfig @@ -2,6 +2,7 @@ CONFIG_ARM=y CONFIG_ARCH_RMOBILE=y CONFIG_TARGET_ARMADILLO_800EVA=y CONFIG_BOOTDELAY=3 +CONFIG_VERSION_VARIABLE=y # CONFIG_CMD_BDI is not set # CONFIG_CMD_CONSOLE is not set # CONFIG_CMD_BOOTD is not set diff --git a/configs/bamboo_defconfig b/configs/bamboo_defconfig index a5a278b98cc..ea694579740 100644 --- a/configs/bamboo_defconfig +++ b/configs/bamboo_defconfig @@ -3,6 +3,7 @@ CONFIG_4xx=y CONFIG_TARGET_BAMBOO=y CONFIG_OF_BOARD_SETUP=y CONFIG_BOOTDELAY=5 +CONFIG_VERSION_VARIABLE=y CONFIG_HUSH_PARSER=y CONFIG_CMD_ASKENV=y CONFIG_CMD_GREPENV=y diff --git a/configs/bcm11130_defconfig b/configs/bcm11130_defconfig index d2a3b7395b4..57cfbd2e89c 100644 --- a/configs/bcm11130_defconfig +++ b/configs/bcm11130_defconfig @@ -1,6 +1,7 @@ CONFIG_ARM=y CONFIG_TARGET_BCM28155_AP=y CONFIG_SYS_EXTRA_OPTIONS="SYS_MMC_ENV_DEV=0" +CONFIG_VERSION_VARIABLE=y CONFIG_HUSH_PARSER=y # CONFIG_AUTOBOOT is not set CONFIG_CMD_BOOTZ=y diff --git a/configs/bcm11130_nand_defconfig b/configs/bcm11130_nand_defconfig index 5fc501fd5e1..586abc0acbc 100644 --- a/configs/bcm11130_nand_defconfig +++ b/configs/bcm11130_nand_defconfig @@ -1,6 +1,7 @@ CONFIG_ARM=y CONFIG_TARGET_BCM28155_AP=y CONFIG_SYS_EXTRA_OPTIONS="NAND" +CONFIG_VERSION_VARIABLE=y CONFIG_HUSH_PARSER=y # CONFIG_AUTOBOOT is not set CONFIG_CMD_BOOTZ=y diff --git a/configs/bcm23550_w1d_defconfig b/configs/bcm23550_w1d_defconfig index ca4feaf5f09..579a2baaeaa 100644 --- a/configs/bcm23550_w1d_defconfig +++ b/configs/bcm23550_w1d_defconfig @@ -1,6 +1,7 @@ CONFIG_ARM=y CONFIG_ENABLE_ARM_SOC_BOOT0_HOOK=y CONFIG_TARGET_BCM23550_W1D=y +CONFIG_VERSION_VARIABLE=y CONFIG_HUSH_PARSER=y CONFIG_FASTBOOT=y CONFIG_USB_FUNCTION_FASTBOOT=y diff --git a/configs/bcm28155_ap_defconfig b/configs/bcm28155_ap_defconfig index eb8aa35571f..768bd0292cd 100644 --- a/configs/bcm28155_ap_defconfig +++ b/configs/bcm28155_ap_defconfig @@ -1,6 +1,7 @@ CONFIG_ARM=y CONFIG_ENABLE_ARM_SOC_BOOT0_HOOK=y CONFIG_TARGET_BCM28155_AP=y +CONFIG_VERSION_VARIABLE=y CONFIG_HUSH_PARSER=y # CONFIG_AUTOBOOT is not set CONFIG_FASTBOOT=y diff --git a/configs/bcm28155_w1d_defconfig b/configs/bcm28155_w1d_defconfig index b849074f817..8a5111fd2b9 100644 --- a/configs/bcm28155_w1d_defconfig +++ b/configs/bcm28155_w1d_defconfig @@ -2,6 +2,7 @@ CONFIG_ARM=y CONFIG_ENABLE_ARM_SOC_BOOT0_HOOK=y CONFIG_TARGET_BCM28155_AP=y CONFIG_SYS_EXTRA_OPTIONS="BCM_SF2_ETH,BCM_SF2_ETH_GMAC" +CONFIG_VERSION_VARIABLE=y CONFIG_HUSH_PARSER=y # CONFIG_AUTOBOOT is not set CONFIG_CMD_BOOTZ=y diff --git a/configs/bcm911360_entphn-ns_defconfig b/configs/bcm911360_entphn-ns_defconfig index a9403a833cc..97ccec6abb6 100644 --- a/configs/bcm911360_entphn-ns_defconfig +++ b/configs/bcm911360_entphn-ns_defconfig @@ -1,6 +1,7 @@ CONFIG_ARM=y CONFIG_TARGET_BCMCYGNUS=y CONFIG_SYS_EXTRA_OPTIONS="SYS_SDRAM_SIZE=0x20000000,ARMV7_NONSEC" +CONFIG_VERSION_VARIABLE=y CONFIG_HUSH_PARSER=y # CONFIG_AUTOBOOT is not set CONFIG_CMD_BOOTZ=y diff --git a/configs/bcm911360_entphn_defconfig b/configs/bcm911360_entphn_defconfig index aee2e2e5968..bfe358ba5be 100644 --- a/configs/bcm911360_entphn_defconfig +++ b/configs/bcm911360_entphn_defconfig @@ -1,6 +1,7 @@ CONFIG_ARM=y CONFIG_TARGET_BCMCYGNUS=y CONFIG_SYS_EXTRA_OPTIONS="SYS_SDRAM_SIZE=0x20000000" +CONFIG_VERSION_VARIABLE=y CONFIG_HUSH_PARSER=y # CONFIG_AUTOBOOT is not set CONFIG_CMD_BOOTZ=y diff --git a/configs/bcm911360k_defconfig b/configs/bcm911360k_defconfig index df76dac5456..ccdbd319a7e 100644 --- a/configs/bcm911360k_defconfig +++ b/configs/bcm911360k_defconfig @@ -1,6 +1,7 @@ CONFIG_ARM=y CONFIG_TARGET_BCMCYGNUS=y CONFIG_SYS_EXTRA_OPTIONS="SYS_SDRAM_SIZE=0x40000000" +CONFIG_VERSION_VARIABLE=y CONFIG_HUSH_PARSER=y # CONFIG_AUTOBOOT is not set CONFIG_CMD_BOOTZ=y diff --git a/configs/bcm958300k-ns_defconfig b/configs/bcm958300k-ns_defconfig index 0b00ce39d78..ff5ee5494a5 100644 --- a/configs/bcm958300k-ns_defconfig +++ b/configs/bcm958300k-ns_defconfig @@ -1,6 +1,7 @@ CONFIG_ARM=y CONFIG_TARGET_BCMCYGNUS=y CONFIG_SYS_EXTRA_OPTIONS="SYS_SDRAM_SIZE=0x40000000,ARMV7_NONSEC" +CONFIG_VERSION_VARIABLE=y CONFIG_HUSH_PARSER=y # CONFIG_AUTOBOOT is not set CONFIG_CMD_BOOTZ=y diff --git a/configs/bcm958300k_defconfig b/configs/bcm958300k_defconfig index df76dac5456..ccdbd319a7e 100644 --- a/configs/bcm958300k_defconfig +++ b/configs/bcm958300k_defconfig @@ -1,6 +1,7 @@ CONFIG_ARM=y CONFIG_TARGET_BCMCYGNUS=y CONFIG_SYS_EXTRA_OPTIONS="SYS_SDRAM_SIZE=0x40000000" +CONFIG_VERSION_VARIABLE=y CONFIG_HUSH_PARSER=y # CONFIG_AUTOBOOT is not set CONFIG_CMD_BOOTZ=y diff --git a/configs/bcm958305k_defconfig b/configs/bcm958305k_defconfig index df76dac5456..ccdbd319a7e 100644 --- a/configs/bcm958305k_defconfig +++ b/configs/bcm958305k_defconfig @@ -1,6 +1,7 @@ CONFIG_ARM=y CONFIG_TARGET_BCMCYGNUS=y CONFIG_SYS_EXTRA_OPTIONS="SYS_SDRAM_SIZE=0x40000000" +CONFIG_VERSION_VARIABLE=y CONFIG_HUSH_PARSER=y # CONFIG_AUTOBOOT is not set CONFIG_CMD_BOOTZ=y diff --git a/configs/bcm958622hr_defconfig b/configs/bcm958622hr_defconfig index 99e545223be..4a93a2d628d 100644 --- a/configs/bcm958622hr_defconfig +++ b/configs/bcm958622hr_defconfig @@ -1,6 +1,7 @@ CONFIG_ARM=y CONFIG_TARGET_BCMNSP=y CONFIG_SYS_EXTRA_OPTIONS="SYS_SDRAM_SIZE=0x01000000" +CONFIG_VERSION_VARIABLE=y CONFIG_HUSH_PARSER=y # CONFIG_AUTOBOOT is not set CONFIG_CMD_BOOTZ=y diff --git a/configs/bg0900_defconfig b/configs/bg0900_defconfig index b3a13c63e6d..ae54562076c 100644 --- a/configs/bg0900_defconfig +++ b/configs/bg0900_defconfig @@ -2,6 +2,7 @@ CONFIG_ARM=y CONFIG_TARGET_BG0900=y CONFIG_SPL=y CONFIG_BOOTDELAY=3 +CONFIG_VERSION_VARIABLE=y CONFIG_HUSH_PARSER=y CONFIG_CMD_BOOTZ=y # CONFIG_CMD_IMLS is not set diff --git a/configs/birdland_bav335a_defconfig b/configs/birdland_bav335a_defconfig index afc93c314a9..c721ad58c7b 100644 --- a/configs/birdland_bav335a_defconfig +++ b/configs/birdland_bav335a_defconfig @@ -4,6 +4,7 @@ CONFIG_BAV_VERSION=1 CONFIG_SPL=y CONFIG_FIT=y CONFIG_SYS_EXTRA_OPTIONS="SERIAL1,CONS_INDEX=1" +CONFIG_VERSION_VARIABLE=y CONFIG_HUSH_PARSER=y CONFIG_CMD_BOOTZ=y # CONFIG_CMD_IMLS is not set diff --git a/configs/birdland_bav335b_defconfig b/configs/birdland_bav335b_defconfig index 382a9041a52..4400bb1d235 100644 --- a/configs/birdland_bav335b_defconfig +++ b/configs/birdland_bav335b_defconfig @@ -4,6 +4,7 @@ CONFIG_BAV_VERSION=2 CONFIG_SPL=y CONFIG_FIT=y CONFIG_SYS_EXTRA_OPTIONS="SERIAL1,CONS_INDEX=1" +CONFIG_VERSION_VARIABLE=y CONFIG_HUSH_PARSER=y CONFIG_CMD_BOOTZ=y # CONFIG_CMD_IMLS is not set diff --git a/configs/blanche_defconfig b/configs/blanche_defconfig index 90c888987ed..fa6735d71a6 100644 --- a/configs/blanche_defconfig +++ b/configs/blanche_defconfig @@ -5,6 +5,7 @@ CONFIG_TARGET_BLANCHE=y CONFIG_BOOTSTAGE_USER_COUNT=0x20 CONFIG_BOOTSTAGE_STASH_ADDR=0x0 CONFIG_BOOTSTAGE_STASH_SIZE=0x4096 +CONFIG_VERSION_VARIABLE=y CONFIG_CMD_BOOTZ=y # CONFIG_CMD_IMI is not set # CONFIG_CMD_IMLS is not set diff --git a/configs/brppt1_mmc_defconfig b/configs/brppt1_mmc_defconfig index cf2800bf17a..881930e085e 100644 --- a/configs/brppt1_mmc_defconfig +++ b/configs/brppt1_mmc_defconfig @@ -4,6 +4,7 @@ CONFIG_SPL=y CONFIG_OF_BOARD_SETUP=y CONFIG_SYS_EXTRA_OPTIONS="SERIAL1,CONS_INDEX=1,EMMC_BOOT" CONFIG_BOOTDELAY=-2 +CONFIG_VERSION_VARIABLE=y CONFIG_HUSH_PARSER=y CONFIG_CMD_BOOTZ=y # CONFIG_CMD_IMI is not set diff --git a/configs/brppt1_nand_defconfig b/configs/brppt1_nand_defconfig index a14a1308309..9c7c07e6de6 100644 --- a/configs/brppt1_nand_defconfig +++ b/configs/brppt1_nand_defconfig @@ -4,6 +4,7 @@ CONFIG_SPL=y CONFIG_OF_BOARD_SETUP=y CONFIG_SYS_EXTRA_OPTIONS="SERIAL1,CONS_INDEX=1,NAND" CONFIG_BOOTDELAY=-2 +CONFIG_VERSION_VARIABLE=y CONFIG_HUSH_PARSER=y CONFIG_CMD_BOOTZ=y # CONFIG_CMD_IMI is not set diff --git a/configs/brppt1_spi_defconfig b/configs/brppt1_spi_defconfig index fee9973187f..fc1f1e6e1c3 100644 --- a/configs/brppt1_spi_defconfig +++ b/configs/brppt1_spi_defconfig @@ -5,6 +5,7 @@ CONFIG_OF_BOARD_SETUP=y CONFIG_SYS_EXTRA_OPTIONS="SERIAL1,CONS_INDEX=1,SPI_BOOT,EMMC_BOOT" CONFIG_SPI_BOOT=y CONFIG_BOOTDELAY=-2 +CONFIG_VERSION_VARIABLE=y CONFIG_HUSH_PARSER=y CONFIG_CMD_BOOTZ=y # CONFIG_CMD_IMI is not set diff --git a/configs/brxre1_defconfig b/configs/brxre1_defconfig index 2567a402051..3895eec772b 100644 --- a/configs/brxre1_defconfig +++ b/configs/brxre1_defconfig @@ -3,6 +3,7 @@ CONFIG_TARGET_BRXRE1=y CONFIG_SPL=y CONFIG_SYS_EXTRA_OPTIONS="SERIAL1,CONS_INDEX=1" CONFIG_BOOTDELAY=-2 +CONFIG_VERSION_VARIABLE=y CONFIG_HUSH_PARSER=y # CONFIG_CMD_BOOTD is not set # CONFIG_CMD_BOOTM is not set diff --git a/configs/bubinga_defconfig b/configs/bubinga_defconfig index 9bfe8285937..d18e89e6138 100644 --- a/configs/bubinga_defconfig +++ b/configs/bubinga_defconfig @@ -3,6 +3,7 @@ CONFIG_4xx=y CONFIG_TARGET_BUBINGA=y CONFIG_OF_BOARD_SETUP=y CONFIG_BOOTDELAY=5 +CONFIG_VERSION_VARIABLE=y CONFIG_HUSH_PARSER=y CONFIG_CMD_ASKENV=y CONFIG_CMD_GREPENV=y diff --git a/configs/cairo_defconfig b/configs/cairo_defconfig index c529c7c464b..7d8fe119ae8 100644 --- a/configs/cairo_defconfig +++ b/configs/cairo_defconfig @@ -3,6 +3,7 @@ CONFIG_OMAP34XX=y CONFIG_TARGET_OMAP3_CAIRO=y CONFIG_SPL=y CONFIG_BOOTDELAY=-2 +CONFIG_VERSION_VARIABLE=y CONFIG_HUSH_PARSER=y CONFIG_SYS_PROMPT="Cairo # " CONFIG_CMD_BOOTZ=y diff --git a/configs/calimain_defconfig b/configs/calimain_defconfig index 505ab3734a0..9cc4a8588df 100644 --- a/configs/calimain_defconfig +++ b/configs/calimain_defconfig @@ -2,6 +2,7 @@ CONFIG_ARM=y CONFIG_ARCH_DAVINCI=y CONFIG_TARGET_CALIMAIN=y CONFIG_BOOTDELAY=0 +CONFIG_VERSION_VARIABLE=y CONFIG_HUSH_PARSER=y CONFIG_SYS_PROMPT="Calimain > " CONFIG_AUTOBOOT_KEYED=y diff --git a/configs/canyonlands_defconfig b/configs/canyonlands_defconfig index f3b3e524865..efe87f33d99 100644 --- a/configs/canyonlands_defconfig +++ b/configs/canyonlands_defconfig @@ -5,6 +5,7 @@ CONFIG_CANYONLANDS=y CONFIG_DEFAULT_DEVICE_TREE="canyonlands" CONFIG_OF_BOARD_SETUP=y CONFIG_BOOTDELAY=5 +CONFIG_VERSION_VARIABLE=y CONFIG_HUSH_PARSER=y CONFIG_CMD_ASKENV=y CONFIG_CMD_GREPENV=y diff --git a/configs/cm_t335_defconfig b/configs/cm_t335_defconfig index 1b293319bb5..1528d1bc820 100644 --- a/configs/cm_t335_defconfig +++ b/configs/cm_t335_defconfig @@ -1,6 +1,7 @@ CONFIG_ARM=y CONFIG_TARGET_CM_T335=y CONFIG_SPL=y +CONFIG_VERSION_VARIABLE=y CONFIG_HUSH_PARSER=y CONFIG_SYS_PROMPT="CM-T335 # " CONFIG_CMD_BOOTZ=y diff --git a/configs/cm_t43_defconfig b/configs/cm_t43_defconfig index 00c93fdcf4d..a2ffcb250d6 100644 --- a/configs/cm_t43_defconfig +++ b/configs/cm_t43_defconfig @@ -1,6 +1,7 @@ CONFIG_ARM=y CONFIG_TARGET_CM_T43=y CONFIG_SPL=y +CONFIG_VERSION_VARIABLE=y CONFIG_HUSH_PARSER=y CONFIG_SYS_PROMPT="CM-T43 # " CONFIG_CMD_BOOTZ=y diff --git a/configs/cm_t54_defconfig b/configs/cm_t54_defconfig index 8df06e39e1d..18bb04e8bc8 100644 --- a/configs/cm_t54_defconfig +++ b/configs/cm_t54_defconfig @@ -4,6 +4,7 @@ CONFIG_TARGET_CM_T54=y CONFIG_SPL=y CONFIG_OF_BOARD_SETUP=y CONFIG_BOOTDELAY=3 +CONFIG_VERSION_VARIABLE=y CONFIG_HUSH_PARSER=y CONFIG_SYS_PROMPT="CM-T54 # " CONFIG_CMD_BOOTZ=y diff --git a/configs/colibri_vf_defconfig b/configs/colibri_vf_defconfig index ca1565f056a..a045a3f39d3 100644 --- a/configs/colibri_vf_defconfig +++ b/configs/colibri_vf_defconfig @@ -3,6 +3,7 @@ CONFIG_TARGET_COLIBRI_VF=y CONFIG_DEFAULT_DEVICE_TREE="vf610-colibri" CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/toradex/colibri_vf/imximage.cfg,ENV_IS_IN_NAND,IMX_NAND" CONFIG_BOOTDELAY=1 +CONFIG_VERSION_VARIABLE=y CONFIG_HUSH_PARSER=y CONFIG_SYS_PROMPT="Colibri VFxx # " CONFIG_CMD_BOOTZ=y diff --git a/configs/da850_am18xxevm_defconfig b/configs/da850_am18xxevm_defconfig index 69839df7d21..ce49340e54d 100644 --- a/configs/da850_am18xxevm_defconfig +++ b/configs/da850_am18xxevm_defconfig @@ -4,6 +4,7 @@ CONFIG_TARGET_DA850EVM=y CONFIG_SPL=y CONFIG_SYS_EXTRA_OPTIONS="DA850_AM18X_EVM,MAC_ADDR_IN_EEPROM,SYS_I2C_EEPROM_ADDR_LEN=2,SYS_I2C_EEPROM_ADDR=0x50" CONFIG_BOOTDELAY=3 +CONFIG_VERSION_VARIABLE=y CONFIG_HUSH_PARSER=y # CONFIG_CMD_IMLS is not set CONFIG_CMD_ASKENV=y diff --git a/configs/da850evm_defconfig b/configs/da850evm_defconfig index f367b36e7d7..da6615ff359 100644 --- a/configs/da850evm_defconfig +++ b/configs/da850evm_defconfig @@ -4,6 +4,7 @@ CONFIG_TARGET_DA850EVM=y CONFIG_SPL=y CONFIG_SYS_EXTRA_OPTIONS="MAC_ADDR_IN_SPIFLASH" CONFIG_BOOTDELAY=3 +CONFIG_VERSION_VARIABLE=y CONFIG_HUSH_PARSER=y CONFIG_SYS_PROMPT="U-Boot > " CONFIG_CMD_BOOTZ=y diff --git a/configs/da850evm_direct_nor_defconfig b/configs/da850evm_direct_nor_defconfig index 9c5428db6ab..1ab9ff3aae7 100644 --- a/configs/da850evm_direct_nor_defconfig +++ b/configs/da850evm_direct_nor_defconfig @@ -3,6 +3,7 @@ CONFIG_ARCH_DAVINCI=y CONFIG_TARGET_DA850EVM=y CONFIG_SYS_EXTRA_OPTIONS="MAC_ADDR_IN_SPIFLASH,USE_NOR,DIRECT_NOR_BOOT" CONFIG_BOOTDELAY=3 +CONFIG_VERSION_VARIABLE=y CONFIG_HUSH_PARSER=y CONFIG_SYS_PROMPT="U-Boot > " CONFIG_CMD_ASKENV=y diff --git a/configs/devconcenter_defconfig b/configs/devconcenter_defconfig index 5a31e471900..8468d8d4231 100644 --- a/configs/devconcenter_defconfig +++ b/configs/devconcenter_defconfig @@ -5,6 +5,7 @@ CONFIG_FIT=y CONFIG_OF_BOARD_SETUP=y CONFIG_SYS_EXTRA_OPTIONS="DEVCONCENTER" CONFIG_BOOTDELAY=5 +CONFIG_VERSION_VARIABLE=y CONFIG_HUSH_PARSER=y CONFIG_CMD_ASKENV=y CONFIG_CMD_GREPENV=y diff --git a/configs/devkit3250_defconfig b/configs/devkit3250_defconfig index 8ce78be8331..5e4aefbb0ae 100644 --- a/configs/devkit3250_defconfig +++ b/configs/devkit3250_defconfig @@ -3,6 +3,7 @@ CONFIG_TARGET_DEVKIT3250=y CONFIG_SPL=y CONFIG_SPL_SYS_MALLOC_SIMPLE=y CONFIG_BOOTDELAY=1 +CONFIG_VERSION_VARIABLE=y CONFIG_CMD_SPI=y CONFIG_CMD_I2C=y CONFIG_CMD_USB=y diff --git a/configs/devkit8000_defconfig b/configs/devkit8000_defconfig index c8021c614e5..29a246c9331 100644 --- a/configs/devkit8000_defconfig +++ b/configs/devkit8000_defconfig @@ -2,6 +2,7 @@ CONFIG_ARM=y CONFIG_OMAP34XX=y CONFIG_TARGET_DEVKIT8000=y CONFIG_SPL=y +CONFIG_VERSION_VARIABLE=y CONFIG_HUSH_PARSER=y # CONFIG_CMD_IMI is not set # CONFIG_CMD_IMLS is not set diff --git a/configs/dlvision-10g_defconfig b/configs/dlvision-10g_defconfig index e22461d480d..4253b55b412 100644 --- a/configs/dlvision-10g_defconfig +++ b/configs/dlvision-10g_defconfig @@ -5,6 +5,7 @@ CONFIG_FIT=y CONFIG_FIT_VERBOSE=y CONFIG_OF_BOARD_SETUP=y CONFIG_BOOTDELAY=5 +CONFIG_VERSION_VARIABLE=y CONFIG_HUSH_PARSER=y CONFIG_AUTOBOOT_KEYED=y CONFIG_AUTOBOOT_STOP_STR=" " diff --git a/configs/dlvision_defconfig b/configs/dlvision_defconfig index fba36119037..8fd5addd69f 100644 --- a/configs/dlvision_defconfig +++ b/configs/dlvision_defconfig @@ -5,6 +5,7 @@ CONFIG_FIT=y CONFIG_FIT_VERBOSE=y CONFIG_OF_BOARD_SETUP=y CONFIG_BOOTDELAY=5 +CONFIG_VERSION_VARIABLE=y CONFIG_HUSH_PARSER=y # CONFIG_CMD_ELF is not set CONFIG_CMD_ASKENV=y diff --git a/configs/dra7xx_evm_defconfig b/configs/dra7xx_evm_defconfig index d8ee0120146..64184dec887 100644 --- a/configs/dra7xx_evm_defconfig +++ b/configs/dra7xx_evm_defconfig @@ -8,6 +8,7 @@ CONFIG_SPL_STACK_R=y CONFIG_FIT=y CONFIG_OF_BOARD_SETUP=y CONFIG_SPL_LOAD_FIT=y +CONFIG_VERSION_VARIABLE=y CONFIG_HUSH_PARSER=y CONFIG_CMD_BOOTZ=y # CONFIG_CMD_IMLS is not set diff --git a/configs/dra7xx_hs_evm_defconfig b/configs/dra7xx_hs_evm_defconfig index f5b931b3bcb..3dad0fa1004 100644 --- a/configs/dra7xx_hs_evm_defconfig +++ b/configs/dra7xx_hs_evm_defconfig @@ -12,6 +12,7 @@ CONFIG_OF_BOARD_SETUP=y CONFIG_SPL_LOAD_FIT=y CONFIG_SPL_FIT_IMAGE_POST_PROCESS=y CONFIG_FIT_IMAGE_POST_PROCESS=y +CONFIG_VERSION_VARIABLE=y CONFIG_HUSH_PARSER=y CONFIG_CMD_BOOTZ=y # CONFIG_CMD_IMLS is not set diff --git a/configs/duovero_defconfig b/configs/duovero_defconfig index 1ee8d1bd042..be65d6e6a7b 100644 --- a/configs/duovero_defconfig +++ b/configs/duovero_defconfig @@ -2,6 +2,7 @@ CONFIG_ARM=y CONFIG_OMAP44XX=y CONFIG_TARGET_DUOVERO=y CONFIG_SPL=y +CONFIG_VERSION_VARIABLE=y CONFIG_HUSH_PARSER=y CONFIG_SYS_PROMPT="duovero # " CONFIG_CMD_BOOTZ=y diff --git a/configs/ea20_defconfig b/configs/ea20_defconfig index 57df04fb412..5e31c1b2ef7 100644 --- a/configs/ea20_defconfig +++ b/configs/ea20_defconfig @@ -2,6 +2,7 @@ CONFIG_ARM=y CONFIG_ARCH_DAVINCI=y CONFIG_TARGET_EA20=y CONFIG_BOOTDELAY=3 +CONFIG_VERSION_VARIABLE=y CONFIG_HUSH_PARSER=y CONFIG_SYS_PROMPT="ea20 > " # CONFIG_CMD_IMLS is not set diff --git a/configs/ecovec_defconfig b/configs/ecovec_defconfig index e3c0b3655b0..be6b9359cef 100644 --- a/configs/ecovec_defconfig +++ b/configs/ecovec_defconfig @@ -1,6 +1,7 @@ CONFIG_SH=y CONFIG_TARGET_ECOVEC=y CONFIG_BOOTDELAY=3 +CONFIG_VERSION_VARIABLE=y # CONFIG_CMD_BDI is not set # CONFIG_CMD_CONSOLE is not set # CONFIG_CMD_BOOTD is not set diff --git a/configs/espt_defconfig b/configs/espt_defconfig index 81425bddd96..38ae66f7833 100644 --- a/configs/espt_defconfig +++ b/configs/espt_defconfig @@ -1,6 +1,7 @@ CONFIG_SH=y CONFIG_TARGET_ESPT=y CONFIG_BOOTDELAY=-1 +CONFIG_VERSION_VARIABLE=y # CONFIG_CMD_BDI is not set # CONFIG_CMD_CONSOLE is not set # CONFIG_CMD_BOOTD is not set diff --git a/configs/gdppc440etx_defconfig b/configs/gdppc440etx_defconfig index ef4c4ed5d4b..4df39f6be9b 100644 --- a/configs/gdppc440etx_defconfig +++ b/configs/gdppc440etx_defconfig @@ -3,6 +3,7 @@ CONFIG_4xx=y CONFIG_TARGET_GDPPC440ETX=y CONFIG_OF_BOARD_SETUP=y CONFIG_BOOTDELAY=5 +CONFIG_VERSION_VARIABLE=y CONFIG_HUSH_PARSER=y CONFIG_AUTOBOOT_KEYED=y CONFIG_AUTOBOOT_STOP_STR=" " diff --git a/configs/glacier_defconfig b/configs/glacier_defconfig index d8b42274d3e..7546f33540c 100644 --- a/configs/glacier_defconfig +++ b/configs/glacier_defconfig @@ -5,6 +5,7 @@ CONFIG_GLACIER=y CONFIG_DEFAULT_DEVICE_TREE="glacier" CONFIG_OF_BOARD_SETUP=y CONFIG_BOOTDELAY=5 +CONFIG_VERSION_VARIABLE=y CONFIG_HUSH_PARSER=y CONFIG_CMD_ASKENV=y CONFIG_CMD_GREPENV=y diff --git a/configs/glacier_ramboot_defconfig b/configs/glacier_ramboot_defconfig index 2875492c3dc..21f935738dd 100644 --- a/configs/glacier_ramboot_defconfig +++ b/configs/glacier_ramboot_defconfig @@ -6,6 +6,7 @@ CONFIG_DEFAULT_DEVICE_TREE="glacier" CONFIG_OF_BOARD_SETUP=y CONFIG_SYS_EXTRA_OPTIONS="SYS_RAMBOOT,SYS_TEXT_BASE=0x01000000,SYS_LDSCRIPT=board/amcc/canyonlands/u-boot-ram.lds" CONFIG_BOOTDELAY=5 +CONFIG_VERSION_VARIABLE=y CONFIG_HUSH_PARSER=y CONFIG_CMD_ASKENV=y CONFIG_CMD_GREPENV=y diff --git a/configs/gose_defconfig b/configs/gose_defconfig index 702c216a48a..57ad2d7b030 100644 --- a/configs/gose_defconfig +++ b/configs/gose_defconfig @@ -6,6 +6,7 @@ CONFIG_BOOTSTAGE_USER_COUNT=0x20 CONFIG_BOOTSTAGE_STASH_ADDR=0x0 CONFIG_BOOTSTAGE_STASH_SIZE=0x4096 CONFIG_BOOTDELAY=3 +CONFIG_VERSION_VARIABLE=y CONFIG_CMD_BOOTZ=y # CONFIG_CMD_IMI is not set # CONFIG_CMD_IMLS is not set diff --git a/configs/haleakala_defconfig b/configs/haleakala_defconfig index 4130e27602c..270d2a36f78 100644 --- a/configs/haleakala_defconfig +++ b/configs/haleakala_defconfig @@ -4,6 +4,7 @@ CONFIG_TARGET_KILAUEA=y CONFIG_OF_BOARD_SETUP=y CONFIG_SYS_EXTRA_OPTIONS="HALEAKALA" CONFIG_BOOTDELAY=5 +CONFIG_VERSION_VARIABLE=y CONFIG_HUSH_PARSER=y CONFIG_CMD_ASKENV=y CONFIG_CMD_GREPENV=y diff --git a/configs/icon_defconfig b/configs/icon_defconfig index a2a70731da1..6556fa608ba 100644 --- a/configs/icon_defconfig +++ b/configs/icon_defconfig @@ -3,6 +3,7 @@ CONFIG_4xx=y CONFIG_TARGET_ICON=y CONFIG_OF_BOARD_SETUP=y CONFIG_BOOTDELAY=5 +CONFIG_VERSION_VARIABLE=y CONFIG_HUSH_PARSER=y CONFIG_CMD_ASKENV=y CONFIG_CMD_GREPENV=y diff --git a/configs/ids8313_defconfig b/configs/ids8313_defconfig index b0487ef1653..02ca830dc76 100644 --- a/configs/ids8313_defconfig +++ b/configs/ids8313_defconfig @@ -7,6 +7,7 @@ CONFIG_OF_BOARD_SETUP=y CONFIG_OF_STDOUT_VIA_ALIAS=y CONFIG_SYS_EXTRA_OPTIONS="SYS_TEXT_BASE=0xFFF00000" CONFIG_BOOTDELAY=1 +CONFIG_VERSION_VARIABLE=y CONFIG_HUSH_PARSER=y CONFIG_AUTOBOOT_KEYED=y CONFIG_AUTOBOOT_PROMPT="Enter password - autoboot in %d seconds...\n" diff --git a/configs/igep0020_defconfig b/configs/igep0020_defconfig index 13dbb0a77f0..992d48f54dd 100644 --- a/configs/igep0020_defconfig +++ b/configs/igep0020_defconfig @@ -4,6 +4,7 @@ CONFIG_TARGET_OMAP3_IGEP00X0=y CONFIG_SPL=y CONFIG_SYS_EXTRA_OPTIONS="MACH_TYPE=MACH_TYPE_IGEP0020" CONFIG_BOOTDELAY=3 +CONFIG_VERSION_VARIABLE=y CONFIG_HUSH_PARSER=y CONFIG_CMD_BOOTZ=y # CONFIG_CMD_IMLS is not set diff --git a/configs/igep0030_defconfig b/configs/igep0030_defconfig index 3ab5c69e345..84dd4ad8233 100644 --- a/configs/igep0030_defconfig +++ b/configs/igep0030_defconfig @@ -3,6 +3,7 @@ CONFIG_OMAP34XX=y CONFIG_TARGET_OMAP3_IGEP00X0=y CONFIG_SPL=y CONFIG_SYS_EXTRA_OPTIONS="MACH_TYPE=MACH_TYPE_IGEP0030,BOOT_ONENAND" +CONFIG_VERSION_VARIABLE=y CONFIG_HUSH_PARSER=y CONFIG_CMD_BOOTZ=y # CONFIG_CMD_IMLS is not set diff --git a/configs/igep0030_nand_defconfig b/configs/igep0030_nand_defconfig index cdab71bc47b..37417c169c2 100644 --- a/configs/igep0030_nand_defconfig +++ b/configs/igep0030_nand_defconfig @@ -3,6 +3,7 @@ CONFIG_OMAP34XX=y CONFIG_TARGET_OMAP3_IGEP00X0=y CONFIG_SPL=y CONFIG_SYS_EXTRA_OPTIONS="MACH_TYPE=MACH_TYPE_IGEP0030,BOOT_NAND" +CONFIG_VERSION_VARIABLE=y CONFIG_HUSH_PARSER=y CONFIG_CMD_BOOTZ=y # CONFIG_CMD_IMLS is not set diff --git a/configs/igep0032_defconfig b/configs/igep0032_defconfig index d609d895820..95296313185 100644 --- a/configs/igep0032_defconfig +++ b/configs/igep0032_defconfig @@ -3,6 +3,7 @@ CONFIG_OMAP34XX=y CONFIG_TARGET_OMAP3_IGEP00X0=y CONFIG_SPL=y CONFIG_SYS_EXTRA_OPTIONS="MACH_TYPE=MACH_TYPE_IGEP0032,BOOT_ONENAND" +CONFIG_VERSION_VARIABLE=y CONFIG_HUSH_PARSER=y CONFIG_CMD_BOOTZ=y # CONFIG_CMD_IMLS is not set diff --git a/configs/intip_defconfig b/configs/intip_defconfig index 9e11da461ea..7e7a6c04355 100644 --- a/configs/intip_defconfig +++ b/configs/intip_defconfig @@ -5,6 +5,7 @@ CONFIG_FIT=y CONFIG_OF_BOARD_SETUP=y CONFIG_SYS_EXTRA_OPTIONS="INTIB" CONFIG_BOOTDELAY=5 +CONFIG_VERSION_VARIABLE=y CONFIG_HUSH_PARSER=y CONFIG_AUTOBOOT_KEYED=y CONFIG_AUTOBOOT_STOP_STR=" " diff --git a/configs/io64_defconfig b/configs/io64_defconfig index 27ffaeae104..2093210f931 100644 --- a/configs/io64_defconfig +++ b/configs/io64_defconfig @@ -5,6 +5,7 @@ CONFIG_FIT=y CONFIG_FIT_VERBOSE=y CONFIG_OF_BOARD_SETUP=y CONFIG_BOOTDELAY=5 +CONFIG_VERSION_VARIABLE=y CONFIG_HUSH_PARSER=y CONFIG_AUTOBOOT_KEYED=y CONFIG_AUTOBOOT_STOP_STR=" " diff --git a/configs/io_defconfig b/configs/io_defconfig index 2392d9bcb9d..6cca9bf1368 100644 --- a/configs/io_defconfig +++ b/configs/io_defconfig @@ -5,6 +5,7 @@ CONFIG_FIT=y CONFIG_FIT_VERBOSE=y CONFIG_OF_BOARD_SETUP=y CONFIG_BOOTDELAY=5 +CONFIG_VERSION_VARIABLE=y CONFIG_HUSH_PARSER=y CONFIG_AUTOBOOT_KEYED=y CONFIG_AUTOBOOT_STOP_STR=" " diff --git a/configs/iocon_defconfig b/configs/iocon_defconfig index c7b3b277c40..54b8c18dc5d 100644 --- a/configs/iocon_defconfig +++ b/configs/iocon_defconfig @@ -4,6 +4,7 @@ CONFIG_TARGET_IOCON=y CONFIG_FIT=y CONFIG_OF_BOARD_SETUP=y CONFIG_BOOTDELAY=5 +CONFIG_VERSION_VARIABLE=y CONFIG_HUSH_PARSER=y CONFIG_AUTOBOOT_KEYED=y CONFIG_AUTOBOOT_STOP_STR=" " diff --git a/configs/ipam390_defconfig b/configs/ipam390_defconfig index cee698887bf..64fa54cea95 100644 --- a/configs/ipam390_defconfig +++ b/configs/ipam390_defconfig @@ -2,6 +2,7 @@ CONFIG_ARM=y CONFIG_ARCH_DAVINCI=y CONFIG_TARGET_IPAM390=y CONFIG_SPL=y +CONFIG_VERSION_VARIABLE=y CONFIG_HUSH_PARSER=y CONFIG_SYS_PROMPT="U-Boot > " # CONFIG_CMD_IMLS is not set diff --git a/configs/k2e_evm_defconfig b/configs/k2e_evm_defconfig index afc35a4a401..f41fa43974b 100644 --- a/configs/k2e_evm_defconfig +++ b/configs/k2e_evm_defconfig @@ -4,6 +4,7 @@ CONFIG_TARGET_K2E_EVM=y CONFIG_DEFAULT_DEVICE_TREE="k2e-evm" CONFIG_SPL=y CONFIG_OF_BOARD_SETUP=y +CONFIG_VERSION_VARIABLE=y CONFIG_HUSH_PARSER=y CONFIG_SYS_PROMPT="K2E EVM # " CONFIG_CMD_BOOTZ=y diff --git a/configs/k2g_evm_defconfig b/configs/k2g_evm_defconfig index 1bd87e7e912..9890ec610c2 100644 --- a/configs/k2g_evm_defconfig +++ b/configs/k2g_evm_defconfig @@ -4,6 +4,7 @@ CONFIG_TARGET_K2G_EVM=y CONFIG_DEFAULT_DEVICE_TREE="k2g-evm" CONFIG_SPL=y CONFIG_OF_BOARD_SETUP=y +CONFIG_VERSION_VARIABLE=y CONFIG_HUSH_PARSER=y CONFIG_CMD_BOOTZ=y # CONFIG_CMD_IMLS is not set diff --git a/configs/k2hk_evm_defconfig b/configs/k2hk_evm_defconfig index 231cf8e306e..b492db70b69 100644 --- a/configs/k2hk_evm_defconfig +++ b/configs/k2hk_evm_defconfig @@ -4,6 +4,7 @@ CONFIG_TARGET_K2HK_EVM=y CONFIG_DEFAULT_DEVICE_TREE="k2hk-evm" CONFIG_SPL=y CONFIG_OF_BOARD_SETUP=y +CONFIG_VERSION_VARIABLE=y CONFIG_HUSH_PARSER=y CONFIG_SYS_PROMPT="K2HK EVM # " CONFIG_CMD_BOOTZ=y diff --git a/configs/k2l_evm_defconfig b/configs/k2l_evm_defconfig index 3a9ed1849c5..9ce8fd5ba6f 100644 --- a/configs/k2l_evm_defconfig +++ b/configs/k2l_evm_defconfig @@ -4,6 +4,7 @@ CONFIG_TARGET_K2L_EVM=y CONFIG_DEFAULT_DEVICE_TREE="k2l-evm" CONFIG_SPL=y CONFIG_OF_BOARD_SETUP=y +CONFIG_VERSION_VARIABLE=y CONFIG_HUSH_PARSER=y CONFIG_SYS_PROMPT="K2L EVM # " CONFIG_CMD_BOOTZ=y diff --git a/configs/katmai_defconfig b/configs/katmai_defconfig index 30c8bf02bf6..bb0040059c0 100644 --- a/configs/katmai_defconfig +++ b/configs/katmai_defconfig @@ -3,6 +3,7 @@ CONFIG_4xx=y CONFIG_TARGET_KATMAI=y CONFIG_OF_BOARD_SETUP=y CONFIG_BOOTDELAY=5 +CONFIG_VERSION_VARIABLE=y CONFIG_HUSH_PARSER=y CONFIG_CMD_ASKENV=y CONFIG_CMD_GREPENV=y diff --git a/configs/kilauea_defconfig b/configs/kilauea_defconfig index 698de8c3866..f740b0b5c93 100644 --- a/configs/kilauea_defconfig +++ b/configs/kilauea_defconfig @@ -4,6 +4,7 @@ CONFIG_TARGET_KILAUEA=y CONFIG_OF_BOARD_SETUP=y CONFIG_SYS_EXTRA_OPTIONS="KILAUEA" CONFIG_BOOTDELAY=5 +CONFIG_VERSION_VARIABLE=y CONFIG_HUSH_PARSER=y CONFIG_CMD_ASKENV=y CONFIG_CMD_GREPENV=y diff --git a/configs/km_kirkwood_128m16_defconfig b/configs/km_kirkwood_128m16_defconfig index 24413a1ee09..67356b182a4 100644 --- a/configs/km_kirkwood_128m16_defconfig +++ b/configs/km_kirkwood_128m16_defconfig @@ -2,6 +2,7 @@ CONFIG_ARM=y CONFIG_KIRKWOOD=y CONFIG_TARGET_KM_KIRKWOOD=y CONFIG_SYS_EXTRA_OPTIONS="KM_KIRKWOOD_128M16" +CONFIG_VERSION_VARIABLE=y CONFIG_HUSH_PARSER=y CONFIG_AUTOBOOT_KEYED=y CONFIG_AUTOBOOT_PROMPT="Hit <SPACE> key to stop autoboot in %2ds\n" diff --git a/configs/km_kirkwood_defconfig b/configs/km_kirkwood_defconfig index 991fe1dc585..7482b93836c 100644 --- a/configs/km_kirkwood_defconfig +++ b/configs/km_kirkwood_defconfig @@ -2,6 +2,7 @@ CONFIG_ARM=y CONFIG_KIRKWOOD=y CONFIG_TARGET_KM_KIRKWOOD=y CONFIG_SYS_EXTRA_OPTIONS="KM_KIRKWOOD" +CONFIG_VERSION_VARIABLE=y CONFIG_HUSH_PARSER=y CONFIG_AUTOBOOT_KEYED=y CONFIG_AUTOBOOT_PROMPT="Hit <SPACE> key to stop autoboot in %2ds\n" diff --git a/configs/km_kirkwood_pci_defconfig b/configs/km_kirkwood_pci_defconfig index 11c1b7170f4..9b7a5fb6dc5 100644 --- a/configs/km_kirkwood_pci_defconfig +++ b/configs/km_kirkwood_pci_defconfig @@ -2,6 +2,7 @@ CONFIG_ARM=y CONFIG_KIRKWOOD=y CONFIG_TARGET_KM_KIRKWOOD=y CONFIG_SYS_EXTRA_OPTIONS="KM_KIRKWOOD_PCI" +CONFIG_VERSION_VARIABLE=y CONFIG_HUSH_PARSER=y CONFIG_AUTOBOOT_KEYED=y CONFIG_AUTOBOOT_PROMPT="Hit <SPACE> key to stop autoboot in %2ds\n" diff --git a/configs/kmcoge4_defconfig b/configs/kmcoge4_defconfig index 03e69f31771..3125387c371 100644 --- a/configs/kmcoge4_defconfig +++ b/configs/kmcoge4_defconfig @@ -6,6 +6,7 @@ CONFIG_FIT_VERBOSE=y CONFIG_OF_BOARD_SETUP=y CONFIG_OF_STDOUT_VIA_ALIAS=y CONFIG_SYS_EXTRA_OPTIONS="KMCOGE4" +CONFIG_VERSION_VARIABLE=y CONFIG_HUSH_PARSER=y CONFIG_AUTOBOOT_KEYED=y CONFIG_AUTOBOOT_PROMPT="Hit <SPACE> key to stop autoboot in %2ds\n" diff --git a/configs/kmcoge5ne_defconfig b/configs/kmcoge5ne_defconfig index bdf98a44ef4..e03d71b2968 100644 --- a/configs/kmcoge5ne_defconfig +++ b/configs/kmcoge5ne_defconfig @@ -4,6 +4,7 @@ CONFIG_TARGET_KM8360=y CONFIG_OF_BOARD_SETUP=y CONFIG_OF_STDOUT_VIA_ALIAS=y CONFIG_SYS_EXTRA_OPTIONS="KMCOGE5NE" +CONFIG_VERSION_VARIABLE=y CONFIG_HUSH_PARSER=y CONFIG_AUTOBOOT_KEYED=y CONFIG_AUTOBOOT_PROMPT="Hit <SPACE> key to stop autoboot in %2ds\n" diff --git a/configs/kmcoge5un_defconfig b/configs/kmcoge5un_defconfig index 3d1b986c536..221dcb5a2d0 100644 --- a/configs/kmcoge5un_defconfig +++ b/configs/kmcoge5un_defconfig @@ -2,6 +2,7 @@ CONFIG_ARM=y CONFIG_KIRKWOOD=y CONFIG_TARGET_KM_KIRKWOOD=y CONFIG_SYS_EXTRA_OPTIONS="KM_COGE5UN" +CONFIG_VERSION_VARIABLE=y CONFIG_HUSH_PARSER=y CONFIG_AUTOBOOT_KEYED=y CONFIG_AUTOBOOT_PROMPT="Hit <SPACE> key to stop autoboot in %2ds\n" diff --git a/configs/kmeter1_defconfig b/configs/kmeter1_defconfig index 6256bb40e52..52f8be1c928 100644 --- a/configs/kmeter1_defconfig +++ b/configs/kmeter1_defconfig @@ -4,6 +4,7 @@ CONFIG_TARGET_KM8360=y CONFIG_OF_BOARD_SETUP=y CONFIG_OF_STDOUT_VIA_ALIAS=y CONFIG_SYS_EXTRA_OPTIONS="KMETER1" +CONFIG_VERSION_VARIABLE=y CONFIG_HUSH_PARSER=y CONFIG_AUTOBOOT_KEYED=y CONFIG_AUTOBOOT_PROMPT="Hit <SPACE> key to stop autoboot in %2ds\n" diff --git a/configs/kmlion1_defconfig b/configs/kmlion1_defconfig index 79114456bbb..bb388144455 100644 --- a/configs/kmlion1_defconfig +++ b/configs/kmlion1_defconfig @@ -6,6 +6,7 @@ CONFIG_FIT_VERBOSE=y CONFIG_OF_BOARD_SETUP=y CONFIG_OF_STDOUT_VIA_ALIAS=y CONFIG_SYS_EXTRA_OPTIONS="KMLION1" +CONFIG_VERSION_VARIABLE=y CONFIG_HUSH_PARSER=y CONFIG_AUTOBOOT_KEYED=y CONFIG_AUTOBOOT_PROMPT="Hit <SPACE> key to stop autoboot in %2ds\n" diff --git a/configs/kmnusa_defconfig b/configs/kmnusa_defconfig index f5f36b7ef89..01f4fce403c 100644 --- a/configs/kmnusa_defconfig +++ b/configs/kmnusa_defconfig @@ -2,6 +2,7 @@ CONFIG_ARM=y CONFIG_KIRKWOOD=y CONFIG_TARGET_KM_KIRKWOOD=y CONFIG_SYS_EXTRA_OPTIONS="KM_NUSA" +CONFIG_VERSION_VARIABLE=y CONFIG_HUSH_PARSER=y CONFIG_AUTOBOOT_KEYED=y CONFIG_AUTOBOOT_PROMPT="Hit <SPACE> key to stop autoboot in %2ds\n" diff --git a/configs/kmopti2_defconfig b/configs/kmopti2_defconfig index 14fb873794e..daf5a96fa94 100644 --- a/configs/kmopti2_defconfig +++ b/configs/kmopti2_defconfig @@ -4,6 +4,7 @@ CONFIG_TARGET_TUXX1=y CONFIG_OF_BOARD_SETUP=y CONFIG_OF_STDOUT_VIA_ALIAS=y CONFIG_SYS_EXTRA_OPTIONS="KMOPTI2" +CONFIG_VERSION_VARIABLE=y CONFIG_HUSH_PARSER=y CONFIG_AUTOBOOT_KEYED=y CONFIG_AUTOBOOT_PROMPT="Hit <SPACE> key to stop autoboot in %2ds\n" diff --git a/configs/kmsugp1_defconfig b/configs/kmsugp1_defconfig index ef965eaf166..8e0f6da530a 100644 --- a/configs/kmsugp1_defconfig +++ b/configs/kmsugp1_defconfig @@ -2,6 +2,7 @@ CONFIG_ARM=y CONFIG_KIRKWOOD=y CONFIG_TARGET_KM_KIRKWOOD=y CONFIG_SYS_EXTRA_OPTIONS="KM_SUGP1" +CONFIG_VERSION_VARIABLE=y CONFIG_HUSH_PARSER=y CONFIG_AUTOBOOT_KEYED=y CONFIG_AUTOBOOT_PROMPT="Hit <SPACE> key to stop autoboot in %2ds\n" diff --git a/configs/kmsupx5_defconfig b/configs/kmsupx5_defconfig index 33dab62ab3b..67e11f6622a 100644 --- a/configs/kmsupx5_defconfig +++ b/configs/kmsupx5_defconfig @@ -4,6 +4,7 @@ CONFIG_TARGET_TUXX1=y CONFIG_OF_BOARD_SETUP=y CONFIG_OF_STDOUT_VIA_ALIAS=y CONFIG_SYS_EXTRA_OPTIONS="KMSUPX5" +CONFIG_VERSION_VARIABLE=y CONFIG_HUSH_PARSER=y CONFIG_AUTOBOOT_KEYED=y CONFIG_AUTOBOOT_PROMPT="Hit <SPACE> key to stop autoboot in %2ds\n" diff --git a/configs/kmsuv31_defconfig b/configs/kmsuv31_defconfig index 92d278794d0..eb4d583bfb0 100644 --- a/configs/kmsuv31_defconfig +++ b/configs/kmsuv31_defconfig @@ -2,6 +2,7 @@ CONFIG_ARM=y CONFIG_KIRKWOOD=y CONFIG_TARGET_KM_KIRKWOOD=y CONFIG_SYS_EXTRA_OPTIONS="KM_SUV31" +CONFIG_VERSION_VARIABLE=y CONFIG_HUSH_PARSER=y CONFIG_AUTOBOOT_KEYED=y CONFIG_AUTOBOOT_PROMPT="Hit <SPACE> key to stop autoboot in %2ds\n" diff --git a/configs/kmtegr1_defconfig b/configs/kmtegr1_defconfig index b45049942c5..f0b1cca1e10 100644 --- a/configs/kmtegr1_defconfig +++ b/configs/kmtegr1_defconfig @@ -4,6 +4,7 @@ CONFIG_TARGET_SUVD3=y CONFIG_OF_BOARD_SETUP=y CONFIG_OF_STDOUT_VIA_ALIAS=y CONFIG_SYS_EXTRA_OPTIONS="KMTEGR1" +CONFIG_VERSION_VARIABLE=y CONFIG_HUSH_PARSER=y CONFIG_AUTOBOOT_KEYED=y CONFIG_AUTOBOOT_PROMPT="Hit <SPACE> key to stop autoboot in %2ds\n" diff --git a/configs/kmtepr2_defconfig b/configs/kmtepr2_defconfig index a27a9efbce2..936dd91d603 100644 --- a/configs/kmtepr2_defconfig +++ b/configs/kmtepr2_defconfig @@ -4,6 +4,7 @@ CONFIG_TARGET_TUXX1=y CONFIG_OF_BOARD_SETUP=y CONFIG_OF_STDOUT_VIA_ALIAS=y CONFIG_SYS_EXTRA_OPTIONS="KMTEPR2" +CONFIG_VERSION_VARIABLE=y CONFIG_HUSH_PARSER=y CONFIG_AUTOBOOT_KEYED=y CONFIG_AUTOBOOT_PROMPT="Hit <SPACE> key to stop autoboot in %2ds\n" diff --git a/configs/kmvect1_defconfig b/configs/kmvect1_defconfig index 2d74209d1bd..3e310ba34c7 100644 --- a/configs/kmvect1_defconfig +++ b/configs/kmvect1_defconfig @@ -4,6 +4,7 @@ CONFIG_TARGET_SUVD3=y CONFIG_OF_BOARD_SETUP=y CONFIG_OF_STDOUT_VIA_ALIAS=y CONFIG_SYS_EXTRA_OPTIONS="KMVECT1" +CONFIG_VERSION_VARIABLE=y CONFIG_HUSH_PARSER=y CONFIG_AUTOBOOT_KEYED=y CONFIG_AUTOBOOT_PROMPT="Hit <SPACE> key to stop autoboot in %2ds\n" diff --git a/configs/koelsch_defconfig b/configs/koelsch_defconfig index 4a540430bf7..b57426f8b3b 100644 --- a/configs/koelsch_defconfig +++ b/configs/koelsch_defconfig @@ -6,6 +6,7 @@ CONFIG_BOOTSTAGE_USER_COUNT=0x20 CONFIG_BOOTSTAGE_STASH_ADDR=0x0 CONFIG_BOOTSTAGE_STASH_SIZE=0x4096 CONFIG_BOOTDELAY=3 +CONFIG_VERSION_VARIABLE=y CONFIG_CMD_BOOTZ=y # CONFIG_CMD_IMI is not set # CONFIG_CMD_IMLS is not set diff --git a/configs/kzm9g_defconfig b/configs/kzm9g_defconfig index f1ef1c49b30..ba75147e0ec 100644 --- a/configs/kzm9g_defconfig +++ b/configs/kzm9g_defconfig @@ -2,6 +2,7 @@ CONFIG_ARM=y CONFIG_ARCH_RMOBILE=y CONFIG_TARGET_KZM9G=y CONFIG_BOOTDELAY=3 +CONFIG_VERSION_VARIABLE=y CONFIG_SYS_PROMPT="KZM-A9-GT# " CONFIG_CMD_BOOTZ=y CONFIG_CMD_I2C=y diff --git a/configs/lager_defconfig b/configs/lager_defconfig index d3ded6e537e..143fdfb48b5 100644 --- a/configs/lager_defconfig +++ b/configs/lager_defconfig @@ -6,6 +6,7 @@ CONFIG_BOOTSTAGE_USER_COUNT=0x20 CONFIG_BOOTSTAGE_STASH_ADDR=0x0 CONFIG_BOOTSTAGE_STASH_SIZE=0x4096 CONFIG_BOOTDELAY=3 +CONFIG_VERSION_VARIABLE=y CONFIG_CMD_BOOTZ=y # CONFIG_CMD_IMI is not set # CONFIG_CMD_IMLS is not set diff --git a/configs/legoev3_defconfig b/configs/legoev3_defconfig index 8161f730dd5..5ab3a611f4a 100644 --- a/configs/legoev3_defconfig +++ b/configs/legoev3_defconfig @@ -2,6 +2,7 @@ CONFIG_ARM=y CONFIG_ARCH_DAVINCI=y CONFIG_TARGET_LEGOEV3=y CONFIG_BOOTDELAY=0 +CONFIG_VERSION_VARIABLE=y CONFIG_HUSH_PARSER=y CONFIG_AUTOBOOT_KEYED=y CONFIG_AUTOBOOT_PROMPT="Autoboot in %d seconds - press 'l' to stop...\n" diff --git a/configs/luan_defconfig b/configs/luan_defconfig index 90801f4a935..1b93e5babae 100644 --- a/configs/luan_defconfig +++ b/configs/luan_defconfig @@ -3,6 +3,7 @@ CONFIG_4xx=y CONFIG_TARGET_LUAN=y CONFIG_OF_BOARD_SETUP=y CONFIG_BOOTDELAY=5 +CONFIG_VERSION_VARIABLE=y CONFIG_HUSH_PARSER=y CONFIG_CMD_ASKENV=y CONFIG_CMD_GREPENV=y diff --git a/configs/lwmon5_defconfig b/configs/lwmon5_defconfig index f8b0a2e7155..807b9365005 100644 --- a/configs/lwmon5_defconfig +++ b/configs/lwmon5_defconfig @@ -4,6 +4,7 @@ CONFIG_TARGET_LWMON5=y CONFIG_FIT=y CONFIG_OF_BOARD_SETUP=y CONFIG_BOOTDELAY=5 +CONFIG_VERSION_VARIABLE=y CONFIG_HUSH_PARSER=y CONFIG_CMD_ASKENV=y CONFIG_LOOPW=y diff --git a/configs/m28evk_defconfig b/configs/m28evk_defconfig index 4f7b648b88e..bace4f6e121 100644 --- a/configs/m28evk_defconfig +++ b/configs/m28evk_defconfig @@ -3,6 +3,7 @@ CONFIG_TARGET_M28EVK=y CONFIG_SPL=y CONFIG_FIT=y CONFIG_BOOTDELAY=3 +CONFIG_VERSION_VARIABLE=y CONFIG_HUSH_PARSER=y # CONFIG_CMD_IMLS is not set CONFIG_CMD_ASKENV=y diff --git a/configs/m53evk_defconfig b/configs/m53evk_defconfig index 759bf3559f6..042f522eece 100644 --- a/configs/m53evk_defconfig +++ b/configs/m53evk_defconfig @@ -4,6 +4,7 @@ CONFIG_SPL=y CONFIG_FIT=y CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/denx/m53evk/imximage.cfg" CONFIG_BOOTDELAY=3 +CONFIG_VERSION_VARIABLE=y CONFIG_HUSH_PARSER=y # CONFIG_CMD_IMLS is not set CONFIG_CMD_ASKENV=y diff --git a/configs/ma5d4evk_defconfig b/configs/ma5d4evk_defconfig index 090f7fdb27f..e3431ae80d7 100644 --- a/configs/ma5d4evk_defconfig +++ b/configs/ma5d4evk_defconfig @@ -5,6 +5,7 @@ CONFIG_SPL=y CONFIG_FIT=y CONFIG_SYS_EXTRA_OPTIONS="SAMA5D4" CONFIG_BOOTDELAY=3 +CONFIG_VERSION_VARIABLE=y CONFIG_HUSH_PARSER=y CONFIG_CMD_BOOTZ=y # CONFIG_CMD_IMI is not set diff --git a/configs/makalu_defconfig b/configs/makalu_defconfig index 4967e10a105..bb9ee2fc255 100644 --- a/configs/makalu_defconfig +++ b/configs/makalu_defconfig @@ -3,6 +3,7 @@ CONFIG_4xx=y CONFIG_TARGET_MAKALU=y CONFIG_OF_BOARD_SETUP=y CONFIG_BOOTDELAY=5 +CONFIG_VERSION_VARIABLE=y CONFIG_HUSH_PARSER=y CONFIG_CMD_ASKENV=y CONFIG_CMD_GREPENV=y diff --git a/configs/mgcoge3ne_defconfig b/configs/mgcoge3ne_defconfig index d404c8b66f3..3c3449c5cdd 100644 --- a/configs/mgcoge3ne_defconfig +++ b/configs/mgcoge3ne_defconfig @@ -4,6 +4,7 @@ CONFIG_TARGET_KM82XX=y CONFIG_FIT=y CONFIG_OF_BOARD_SETUP=y CONFIG_SYS_EXTRA_OPTIONS="MGCOGE3NE" +CONFIG_VERSION_VARIABLE=y CONFIG_HUSH_PARSER=y CONFIG_AUTOBOOT_KEYED=y CONFIG_AUTOBOOT_PROMPT="Hit <SPACE> key to stop autoboot in %2ds\n" diff --git a/configs/mgcoge3un_defconfig b/configs/mgcoge3un_defconfig index 484abbe9bbd..6f62fc0a047 100644 --- a/configs/mgcoge3un_defconfig +++ b/configs/mgcoge3un_defconfig @@ -2,6 +2,7 @@ CONFIG_ARM=y CONFIG_KIRKWOOD=y CONFIG_TARGET_KM_KIRKWOOD=y CONFIG_SYS_EXTRA_OPTIONS="KM_MGCOGE3UN" +CONFIG_VERSION_VARIABLE=y CONFIG_HUSH_PARSER=y CONFIG_AUTOBOOT_KEYED=y CONFIG_AUTOBOOT_PROMPT="Hit <SPACE> key to stop autoboot in %2ds\n" diff --git a/configs/mgcoge_defconfig b/configs/mgcoge_defconfig index 2cc8f44a28d..54c277f9537 100644 --- a/configs/mgcoge_defconfig +++ b/configs/mgcoge_defconfig @@ -4,6 +4,7 @@ CONFIG_TARGET_KM82XX=y CONFIG_FIT=y CONFIG_OF_BOARD_SETUP=y CONFIG_SYS_EXTRA_OPTIONS="MGCOGE" +CONFIG_VERSION_VARIABLE=y CONFIG_HUSH_PARSER=y CONFIG_AUTOBOOT_KEYED=y CONFIG_AUTOBOOT_PROMPT="Hit <SPACE> key to stop autoboot in %2ds\n" diff --git a/configs/motionpro_defconfig b/configs/motionpro_defconfig index eaaa5eda584..add7c06d798 100644 --- a/configs/motionpro_defconfig +++ b/configs/motionpro_defconfig @@ -2,6 +2,7 @@ CONFIG_PPC=y CONFIG_MPC5xxx=y CONFIG_TARGET_MOTIONPRO=y CONFIG_OF_BOARD_SETUP=y +CONFIG_VERSION_VARIABLE=y CONFIG_HUSH_PARSER=y CONFIG_AUTOBOOT_KEYED=y CONFIG_AUTOBOOT_PROMPT="Autobooting in %d seconds, press \"<Esc><Esc>\" to stop\n" diff --git a/configs/mpr2_defconfig b/configs/mpr2_defconfig index 606b94209ff..839298e7450 100644 --- a/configs/mpr2_defconfig +++ b/configs/mpr2_defconfig @@ -1,5 +1,6 @@ CONFIG_SH=y CONFIG_TARGET_MPR2=y +CONFIG_VERSION_VARIABLE=y # CONFIG_AUTOBOOT is not set # CONFIG_CMD_BDI is not set # CONFIG_CMD_CONSOLE is not set diff --git a/configs/ms7720se_defconfig b/configs/ms7720se_defconfig index 537ea7c9028..a02760af912 100644 --- a/configs/ms7720se_defconfig +++ b/configs/ms7720se_defconfig @@ -1,5 +1,6 @@ CONFIG_SH=y CONFIG_TARGET_MS7720SE=y +CONFIG_VERSION_VARIABLE=y # CONFIG_AUTOBOOT is not set # CONFIG_CMD_BDI is not set # CONFIG_CMD_CONSOLE is not set diff --git a/configs/ms7722se_defconfig b/configs/ms7722se_defconfig index 026f5667502..c97ef612d12 100644 --- a/configs/ms7722se_defconfig +++ b/configs/ms7722se_defconfig @@ -1,6 +1,7 @@ CONFIG_SH=y CONFIG_TARGET_MS7722SE=y CONFIG_BOOTDELAY=3 +CONFIG_VERSION_VARIABLE=y # CONFIG_CMD_BDI is not set # CONFIG_CMD_CONSOLE is not set # CONFIG_CMD_BOOTD is not set diff --git a/configs/mx23_olinuxino_defconfig b/configs/mx23_olinuxino_defconfig index 30af39d0a23..322d941eec5 100644 --- a/configs/mx23_olinuxino_defconfig +++ b/configs/mx23_olinuxino_defconfig @@ -2,6 +2,7 @@ CONFIG_ARM=y CONFIG_TARGET_MX23_OLINUXINO=y CONFIG_SPL=y CONFIG_BOOTDELAY=3 +CONFIG_VERSION_VARIABLE=y CONFIG_HUSH_PARSER=y # CONFIG_CMD_IMLS is not set # CONFIG_CMD_FLASH is not set diff --git a/configs/mx23evk_defconfig b/configs/mx23evk_defconfig index 8e720d20d20..4d3a4eb6bbc 100644 --- a/configs/mx23evk_defconfig +++ b/configs/mx23evk_defconfig @@ -2,6 +2,7 @@ CONFIG_ARM=y CONFIG_TARGET_MX23EVK=y CONFIG_SPL=y CONFIG_BOOTDELAY=1 +CONFIG_VERSION_VARIABLE=y CONFIG_HUSH_PARSER=y CONFIG_CMD_BOOTZ=y # CONFIG_CMD_IMLS is not set diff --git a/configs/mx28evk_auart_console_defconfig b/configs/mx28evk_auart_console_defconfig index ae54319f9ed..d02648684d3 100644 --- a/configs/mx28evk_auart_console_defconfig +++ b/configs/mx28evk_auart_console_defconfig @@ -3,6 +3,7 @@ CONFIG_TARGET_MX28EVK=y CONFIG_SPL=y CONFIG_SYS_EXTRA_OPTIONS="MXS_AUART,MXS_AUART_BASE=MXS_UARTAPP3_BASE,ENV_IS_IN_MMC" CONFIG_BOOTDELAY=1 +CONFIG_VERSION_VARIABLE=y CONFIG_HUSH_PARSER=y CONFIG_CMD_BOOTZ=y # CONFIG_CMD_IMLS is not set diff --git a/configs/mx28evk_defconfig b/configs/mx28evk_defconfig index 2c694226bf7..c6a9be06b2f 100644 --- a/configs/mx28evk_defconfig +++ b/configs/mx28evk_defconfig @@ -4,6 +4,7 @@ CONFIG_SPL=y CONFIG_FIT=y CONFIG_SYS_EXTRA_OPTIONS="ENV_IS_IN_MMC" CONFIG_BOOTDELAY=1 +CONFIG_VERSION_VARIABLE=y CONFIG_HUSH_PARSER=y CONFIG_CMD_BOOTZ=y # CONFIG_CMD_IMLS is not set diff --git a/configs/mx28evk_nand_defconfig b/configs/mx28evk_nand_defconfig index fc9fe9e5d6d..26c9762da1b 100644 --- a/configs/mx28evk_nand_defconfig +++ b/configs/mx28evk_nand_defconfig @@ -3,6 +3,7 @@ CONFIG_TARGET_MX28EVK=y CONFIG_SPL=y CONFIG_SYS_EXTRA_OPTIONS="ENV_IS_IN_NAND" CONFIG_BOOTDELAY=1 +CONFIG_VERSION_VARIABLE=y CONFIG_HUSH_PARSER=y CONFIG_CMD_BOOTZ=y # CONFIG_CMD_IMLS is not set diff --git a/configs/mx28evk_spi_defconfig b/configs/mx28evk_spi_defconfig index 70ef83468e4..73e5fc0d54d 100644 --- a/configs/mx28evk_spi_defconfig +++ b/configs/mx28evk_spi_defconfig @@ -3,6 +3,7 @@ CONFIG_TARGET_MX28EVK=y CONFIG_SPL=y CONFIG_SYS_EXTRA_OPTIONS="ENV_IS_IN_SPI_FLASH" CONFIG_BOOTDELAY=1 +CONFIG_VERSION_VARIABLE=y CONFIG_HUSH_PARSER=y CONFIG_CMD_BOOTZ=y # CONFIG_CMD_IMLS is not set diff --git a/configs/neo_defconfig b/configs/neo_defconfig index b61b7190a63..93a402fd8c4 100644 --- a/configs/neo_defconfig +++ b/configs/neo_defconfig @@ -5,6 +5,7 @@ CONFIG_FIT=y CONFIG_FIT_VERBOSE=y CONFIG_OF_BOARD_SETUP=y CONFIG_BOOTDELAY=5 +CONFIG_VERSION_VARIABLE=y CONFIG_HUSH_PARSER=y # CONFIG_CMD_ELF is not set CONFIG_CMD_ASKENV=y diff --git a/configs/novena_defconfig b/configs/novena_defconfig index 4cc544f3059..33877adac7b 100644 --- a/configs/novena_defconfig +++ b/configs/novena_defconfig @@ -4,6 +4,7 @@ CONFIG_TARGET_KOSAGI_NOVENA=y CONFIG_SPL=y CONFIG_FIT=y CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/imx-common/spl_sd.cfg,MX6Q" +CONFIG_VERSION_VARIABLE=y CONFIG_HUSH_PARSER=y CONFIG_CMD_BOOTZ=y # CONFIG_CMD_IMLS is not set diff --git a/configs/omap3_beagle_defconfig b/configs/omap3_beagle_defconfig index 19b697ebd60..5fd86af64e6 100644 --- a/configs/omap3_beagle_defconfig +++ b/configs/omap3_beagle_defconfig @@ -3,6 +3,7 @@ CONFIG_OMAP34XX=y CONFIG_TARGET_OMAP3_BEAGLE=y CONFIG_SPL=y CONFIG_SYS_EXTRA_OPTIONS="NAND" +CONFIG_VERSION_VARIABLE=y CONFIG_HUSH_PARSER=y CONFIG_CMD_BOOTZ=y # CONFIG_CMD_IMLS is not set diff --git a/configs/omap3_logic_defconfig b/configs/omap3_logic_defconfig index 322624781a6..dfd7611c5d1 100644 --- a/configs/omap3_logic_defconfig +++ b/configs/omap3_logic_defconfig @@ -4,6 +4,7 @@ CONFIG_TARGET_OMAP3_LOGIC=y CONFIG_SPL=y CONFIG_FIT=y CONFIG_SYS_EXTRA_OPTIONS="NAND" +CONFIG_VERSION_VARIABLE=y CONFIG_HUSH_PARSER=y CONFIG_SYS_PROMPT="OMAP Logic # " CONFIG_CMD_BOOTZ=y diff --git a/configs/omap3_overo_defconfig b/configs/omap3_overo_defconfig index 090012aacf5..1e282c11b23 100644 --- a/configs/omap3_overo_defconfig +++ b/configs/omap3_overo_defconfig @@ -2,6 +2,7 @@ CONFIG_ARM=y CONFIG_OMAP34XX=y CONFIG_TARGET_OMAP3_OVERO=y CONFIG_SPL=y +CONFIG_VERSION_VARIABLE=y CONFIG_HUSH_PARSER=y CONFIG_SYS_PROMPT="Overo # " CONFIG_CMD_BOOTZ=y diff --git a/configs/omap3_pandora_defconfig b/configs/omap3_pandora_defconfig index ec5041763b6..0c2c12be32b 100644 --- a/configs/omap3_pandora_defconfig +++ b/configs/omap3_pandora_defconfig @@ -1,6 +1,7 @@ CONFIG_ARM=y CONFIG_OMAP34XX=y CONFIG_TARGET_OMAP3_PANDORA=y +CONFIG_VERSION_VARIABLE=y CONFIG_HUSH_PARSER=y CONFIG_SYS_PROMPT="Pandora # " CONFIG_CMD_BOOTZ=y diff --git a/configs/omap3_zoom1_defconfig b/configs/omap3_zoom1_defconfig index db2aafcac2d..e92d9c681a3 100644 --- a/configs/omap3_zoom1_defconfig +++ b/configs/omap3_zoom1_defconfig @@ -1,6 +1,7 @@ CONFIG_ARM=y CONFIG_OMAP34XX=y CONFIG_TARGET_OMAP3_ZOOM1=y +CONFIG_VERSION_VARIABLE=y CONFIG_HUSH_PARSER=y CONFIG_CMD_BOOTZ=y # CONFIG_CMD_IMI is not set diff --git a/configs/omap4_panda_defconfig b/configs/omap4_panda_defconfig index 50370bed6f9..b69124ef6df 100644 --- a/configs/omap4_panda_defconfig +++ b/configs/omap4_panda_defconfig @@ -2,6 +2,7 @@ CONFIG_ARM=y CONFIG_OMAP44XX=y CONFIG_TARGET_OMAP4_PANDA=y CONFIG_SPL=y +CONFIG_VERSION_VARIABLE=y CONFIG_HUSH_PARSER=y CONFIG_CMD_BOOTZ=y # CONFIG_CMD_IMLS is not set diff --git a/configs/omap4_sdp4430_defconfig b/configs/omap4_sdp4430_defconfig index c5d6d6193c7..684f4e13ab3 100644 --- a/configs/omap4_sdp4430_defconfig +++ b/configs/omap4_sdp4430_defconfig @@ -2,6 +2,7 @@ CONFIG_ARM=y CONFIG_OMAP44XX=y CONFIG_TARGET_OMAP4_SDP4430=y CONFIG_SPL=y +CONFIG_VERSION_VARIABLE=y CONFIG_HUSH_PARSER=y CONFIG_CMD_BOOTZ=y # CONFIG_CMD_IMLS is not set diff --git a/configs/omap5_uevm_defconfig b/configs/omap5_uevm_defconfig index d643a771ed6..ec75672c7a1 100644 --- a/configs/omap5_uevm_defconfig +++ b/configs/omap5_uevm_defconfig @@ -2,6 +2,7 @@ CONFIG_ARM=y CONFIG_OMAP54XX=y CONFIG_TARGET_OMAP5_UEVM=y CONFIG_SPL=y +CONFIG_VERSION_VARIABLE=y CONFIG_HUSH_PARSER=y CONFIG_CMD_BOOTZ=y # CONFIG_CMD_IMLS is not set diff --git a/configs/omapl138_lcdk_defconfig b/configs/omapl138_lcdk_defconfig index 51dc1dba355..8cb486dac07 100644 --- a/configs/omapl138_lcdk_defconfig +++ b/configs/omapl138_lcdk_defconfig @@ -3,6 +3,7 @@ CONFIG_ARCH_DAVINCI=y CONFIG_TARGET_OMAPL138_LCDK=y CONFIG_SPL=y CONFIG_BOOTDELAY=3 +CONFIG_VERSION_VARIABLE=y CONFIG_HUSH_PARSER=y CONFIG_SYS_PROMPT="U-Boot > " # CONFIG_CMD_IMLS is not set diff --git a/configs/pcm051_rev1_defconfig b/configs/pcm051_rev1_defconfig index d14a51e1d42..f14ba67cff6 100644 --- a/configs/pcm051_rev1_defconfig +++ b/configs/pcm051_rev1_defconfig @@ -2,6 +2,7 @@ CONFIG_ARM=y CONFIG_TARGET_PCM051=y CONFIG_SPL=y CONFIG_SYS_EXTRA_OPTIONS="REV1" +CONFIG_VERSION_VARIABLE=y CONFIG_HUSH_PARSER=y CONFIG_CMD_BOOTZ=y # CONFIG_CMD_IMLS is not set diff --git a/configs/pcm051_rev3_defconfig b/configs/pcm051_rev3_defconfig index f0e3c7b07a5..3921886025c 100644 --- a/configs/pcm051_rev3_defconfig +++ b/configs/pcm051_rev3_defconfig @@ -2,6 +2,7 @@ CONFIG_ARM=y CONFIG_TARGET_PCM051=y CONFIG_SPL=y CONFIG_SYS_EXTRA_OPTIONS="REV3" +CONFIG_VERSION_VARIABLE=y CONFIG_HUSH_PARSER=y CONFIG_CMD_BOOTZ=y # CONFIG_CMD_IMLS is not set diff --git a/configs/pengwyn_defconfig b/configs/pengwyn_defconfig index 4699ea239b2..0035d892b41 100644 --- a/configs/pengwyn_defconfig +++ b/configs/pengwyn_defconfig @@ -1,6 +1,7 @@ CONFIG_ARM=y CONFIG_TARGET_PENGWYN=y CONFIG_SPL=y +CONFIG_VERSION_VARIABLE=y CONFIG_HUSH_PARSER=y CONFIG_CMD_BOOTZ=y # CONFIG_CMD_IMLS is not set diff --git a/configs/pepper_defconfig b/configs/pepper_defconfig index 4a46f24a6a8..8a38b89e7d8 100644 --- a/configs/pepper_defconfig +++ b/configs/pepper_defconfig @@ -1,6 +1,7 @@ CONFIG_ARM=y CONFIG_TARGET_PEPPER=y CONFIG_SPL=y +CONFIG_VERSION_VARIABLE=y CONFIG_HUSH_PARSER=y CONFIG_SYS_PROMPT="pepper# " CONFIG_CMD_BOOTZ=y diff --git a/configs/porter_defconfig b/configs/porter_defconfig index fe3f9d14f22..433b6adcfb1 100644 --- a/configs/porter_defconfig +++ b/configs/porter_defconfig @@ -6,6 +6,7 @@ CONFIG_BOOTSTAGE_USER_COUNT=0x20 CONFIG_BOOTSTAGE_STASH_ADDR=0x0 CONFIG_BOOTSTAGE_STASH_SIZE=0x4096 CONFIG_BOOTDELAY=3 +CONFIG_VERSION_VARIABLE=y CONFIG_CMD_BOOTZ=y # CONFIG_CMD_IMI is not set # CONFIG_CMD_IMLS is not set diff --git a/configs/portl2_defconfig b/configs/portl2_defconfig index 87fd22182a0..94f9349381f 100644 --- a/configs/portl2_defconfig +++ b/configs/portl2_defconfig @@ -2,6 +2,7 @@ CONFIG_ARM=y CONFIG_KIRKWOOD=y CONFIG_TARGET_KM_KIRKWOOD=y CONFIG_SYS_EXTRA_OPTIONS="KM_PORTL2" +CONFIG_VERSION_VARIABLE=y CONFIG_HUSH_PARSER=y CONFIG_AUTOBOOT_KEYED=y CONFIG_AUTOBOOT_PROMPT="Hit <SPACE> key to stop autoboot in %2ds\n" diff --git a/configs/r0p7734_defconfig b/configs/r0p7734_defconfig index 5f77e053487..e040003ebeb 100644 --- a/configs/r0p7734_defconfig +++ b/configs/r0p7734_defconfig @@ -1,6 +1,7 @@ CONFIG_SH=y CONFIG_TARGET_R0P7734=y CONFIG_BOOTDELAY=3 +CONFIG_VERSION_VARIABLE=y # CONFIG_CMD_BDI is not set # CONFIG_CMD_CONSOLE is not set # CONFIG_CMD_BOOTD is not set diff --git a/configs/rainier_defconfig b/configs/rainier_defconfig index 093207ce4ce..c0e647eda8f 100644 --- a/configs/rainier_defconfig +++ b/configs/rainier_defconfig @@ -4,6 +4,7 @@ CONFIG_TARGET_SEQUOIA=y CONFIG_OF_BOARD_SETUP=y CONFIG_SYS_EXTRA_OPTIONS="RAINIER" CONFIG_BOOTDELAY=5 +CONFIG_VERSION_VARIABLE=y CONFIG_HUSH_PARSER=y CONFIG_CMD_ASKENV=y CONFIG_CMD_GREPENV=y diff --git a/configs/rainier_ramboot_defconfig b/configs/rainier_ramboot_defconfig index a7879aef5d7..7030fe46df6 100644 --- a/configs/rainier_ramboot_defconfig +++ b/configs/rainier_ramboot_defconfig @@ -4,6 +4,7 @@ CONFIG_TARGET_SEQUOIA=y CONFIG_OF_BOARD_SETUP=y CONFIG_SYS_EXTRA_OPTIONS="RAINIER,SYS_RAMBOOT,SYS_TEXT_BASE=0x01000000,SYS_LDSCRIPT=board/amcc/sequoia/u-boot-ram.lds" CONFIG_BOOTDELAY=5 +CONFIG_VERSION_VARIABLE=y CONFIG_HUSH_PARSER=y CONFIG_CMD_ASKENV=y CONFIG_CMD_GREPENV=y diff --git a/configs/redwood_defconfig b/configs/redwood_defconfig index 1cf4832c187..b0400ebc0e3 100644 --- a/configs/redwood_defconfig +++ b/configs/redwood_defconfig @@ -3,6 +3,7 @@ CONFIG_4xx=y CONFIG_TARGET_REDWOOD=y CONFIG_OF_BOARD_SETUP=y CONFIG_BOOTDELAY=5 +CONFIG_VERSION_VARIABLE=y CONFIG_HUSH_PARSER=y CONFIG_CMD_ASKENV=y CONFIG_CMD_GREPENV=y diff --git a/configs/rsk7203_defconfig b/configs/rsk7203_defconfig index f2e9deb856a..f92536b445b 100644 --- a/configs/rsk7203_defconfig +++ b/configs/rsk7203_defconfig @@ -1,5 +1,6 @@ CONFIG_SH=y CONFIG_TARGET_RSK7203=y +CONFIG_VERSION_VARIABLE=y # CONFIG_AUTOBOOT is not set # CONFIG_CMD_BDI is not set # CONFIG_CMD_CONSOLE is not set diff --git a/configs/salvator-x_defconfig b/configs/salvator-x_defconfig index e16acd3e560..9df4867b141 100644 --- a/configs/salvator-x_defconfig +++ b/configs/salvator-x_defconfig @@ -6,6 +6,7 @@ CONFIG_TARGET_SALVATOR_X=y CONFIG_BOOTSTAGE_USER_COUNT=0x20 CONFIG_BOOTSTAGE_STASH_ADDR=0x0 CONFIG_BOOTSTAGE_STASH_SIZE=0x4096 +CONFIG_VERSION_VARIABLE=y CONFIG_CMD_BOOTZ=y # CONFIG_CMD_IMI is not set # CONFIG_CMD_IMLS is not set diff --git a/configs/sansa_fuze_plus_defconfig b/configs/sansa_fuze_plus_defconfig index 16f61de5217..7af5935bc44 100644 --- a/configs/sansa_fuze_plus_defconfig +++ b/configs/sansa_fuze_plus_defconfig @@ -2,6 +2,7 @@ CONFIG_ARM=y CONFIG_TARGET_SANSA_FUZE_PLUS=y CONFIG_SPL=y CONFIG_BOOTDELAY=3 +CONFIG_VERSION_VARIABLE=y CONFIG_HUSH_PARSER=y # CONFIG_CMD_IMLS is not set CONFIG_CMD_MEMTEST=y diff --git a/configs/sc_sps_1_defconfig b/configs/sc_sps_1_defconfig index 182d49f4a3c..30233fc7efa 100644 --- a/configs/sc_sps_1_defconfig +++ b/configs/sc_sps_1_defconfig @@ -2,6 +2,7 @@ CONFIG_ARM=y CONFIG_TARGET_SC_SPS_1=y CONFIG_SPL=y CONFIG_BOOTDELAY=3 +CONFIG_VERSION_VARIABLE=y CONFIG_HUSH_PARSER=y # CONFIG_CMD_IMLS is not set # CONFIG_CMD_FLASH is not set diff --git a/configs/sequoia_defconfig b/configs/sequoia_defconfig index f379922d7a6..9bdab0bc212 100644 --- a/configs/sequoia_defconfig +++ b/configs/sequoia_defconfig @@ -4,6 +4,7 @@ CONFIG_TARGET_SEQUOIA=y CONFIG_OF_BOARD_SETUP=y CONFIG_SYS_EXTRA_OPTIONS="SEQUOIA" CONFIG_BOOTDELAY=5 +CONFIG_VERSION_VARIABLE=y CONFIG_HUSH_PARSER=y CONFIG_CMD_ASKENV=y CONFIG_CMD_GREPENV=y diff --git a/configs/sequoia_ramboot_defconfig b/configs/sequoia_ramboot_defconfig index 3fd8b25fe4d..65ae39aafc9 100644 --- a/configs/sequoia_ramboot_defconfig +++ b/configs/sequoia_ramboot_defconfig @@ -4,6 +4,7 @@ CONFIG_TARGET_SEQUOIA=y CONFIG_OF_BOARD_SETUP=y CONFIG_SYS_EXTRA_OPTIONS="SEQUOIA,SYS_RAMBOOT,SYS_TEXT_BASE=0x01000000,SYS_LDSCRIPT=board/amcc/sequoia/u-boot-ram.lds" CONFIG_BOOTDELAY=5 +CONFIG_VERSION_VARIABLE=y CONFIG_HUSH_PARSER=y CONFIG_CMD_ASKENV=y CONFIG_CMD_GREPENV=y diff --git a/configs/sh7752evb_defconfig b/configs/sh7752evb_defconfig index f7e055b9223..73b1ac68042 100644 --- a/configs/sh7752evb_defconfig +++ b/configs/sh7752evb_defconfig @@ -2,6 +2,7 @@ CONFIG_SH=y CONFIG_SH_32BIT=y CONFIG_TARGET_SH7752EVB=y CONFIG_BOOTDELAY=3 +CONFIG_VERSION_VARIABLE=y # CONFIG_CMD_BDI is not set # CONFIG_CMD_CONSOLE is not set # CONFIG_CMD_BOOTD is not set diff --git a/configs/sh7753evb_defconfig b/configs/sh7753evb_defconfig index fc6c7b16444..e0037a6362e 100644 --- a/configs/sh7753evb_defconfig +++ b/configs/sh7753evb_defconfig @@ -1,6 +1,7 @@ CONFIG_SH=y CONFIG_TARGET_SH7753EVB=y CONFIG_BOOTDELAY=3 +CONFIG_VERSION_VARIABLE=y # CONFIG_CMD_BDI is not set # CONFIG_CMD_CONSOLE is not set # CONFIG_CMD_BOOTD is not set diff --git a/configs/sh7757lcr_defconfig b/configs/sh7757lcr_defconfig index b0d3f28591f..a80c10c444d 100644 --- a/configs/sh7757lcr_defconfig +++ b/configs/sh7757lcr_defconfig @@ -2,6 +2,7 @@ CONFIG_SH=y CONFIG_SH_32BIT=y CONFIG_TARGET_SH7757LCR=y CONFIG_BOOTDELAY=3 +CONFIG_VERSION_VARIABLE=y # CONFIG_CMD_BDI is not set # CONFIG_CMD_CONSOLE is not set # CONFIG_CMD_BOOTD is not set diff --git a/configs/sh7763rdp_defconfig b/configs/sh7763rdp_defconfig index 41d2b55a108..5957a56a743 100644 --- a/configs/sh7763rdp_defconfig +++ b/configs/sh7763rdp_defconfig @@ -1,6 +1,7 @@ CONFIG_SH=y CONFIG_TARGET_SH7763RDP=y CONFIG_BOOTDELAY=-1 +CONFIG_VERSION_VARIABLE=y # CONFIG_CMD_BDI is not set # CONFIG_CMD_CONSOLE is not set # CONFIG_CMD_BOOTD is not set diff --git a/configs/sh7785lcr_32bit_defconfig b/configs/sh7785lcr_32bit_defconfig index 5bb6322ec35..8824d53ccf0 100644 --- a/configs/sh7785lcr_32bit_defconfig +++ b/configs/sh7785lcr_32bit_defconfig @@ -2,6 +2,7 @@ CONFIG_SH=y CONFIG_SH_32BIT=y CONFIG_TARGET_SH7785LCR=y CONFIG_BOOTDELAY=3 +CONFIG_VERSION_VARIABLE=y # CONFIG_CMD_BDI is not set # CONFIG_CMD_CONSOLE is not set # CONFIG_CMD_BOOTD is not set diff --git a/configs/sh7785lcr_defconfig b/configs/sh7785lcr_defconfig index 1b9d76c8d32..386eb339726 100644 --- a/configs/sh7785lcr_defconfig +++ b/configs/sh7785lcr_defconfig @@ -1,6 +1,7 @@ CONFIG_SH=y CONFIG_TARGET_SH7785LCR=y CONFIG_BOOTDELAY=3 +CONFIG_VERSION_VARIABLE=y # CONFIG_CMD_BDI is not set # CONFIG_CMD_CONSOLE is not set # CONFIG_CMD_BOOTD is not set diff --git a/configs/shmin_defconfig b/configs/shmin_defconfig index 65b452545de..d5f04d8b86b 100644 --- a/configs/shmin_defconfig +++ b/configs/shmin_defconfig @@ -1,5 +1,6 @@ CONFIG_SH=y CONFIG_TARGET_SHMIN=y +CONFIG_VERSION_VARIABLE=y # CONFIG_AUTOBOOT is not set # CONFIG_CMD_BDI is not set # CONFIG_CMD_CONSOLE is not set diff --git a/configs/silk_defconfig b/configs/silk_defconfig index a0259a71698..6be29454dbf 100644 --- a/configs/silk_defconfig +++ b/configs/silk_defconfig @@ -6,6 +6,7 @@ CONFIG_BOOTSTAGE_USER_COUNT=0x20 CONFIG_BOOTSTAGE_STASH_ADDR=0x0 CONFIG_BOOTSTAGE_STASH_SIZE=0x4096 CONFIG_BOOTDELAY=3 +CONFIG_VERSION_VARIABLE=y CONFIG_CMD_BOOTZ=y # CONFIG_CMD_IMI is not set # CONFIG_CMD_IMLS is not set diff --git a/configs/socfpga_arria5_defconfig b/configs/socfpga_arria5_defconfig index 7888ee58936..a6d4945d4ce 100644 --- a/configs/socfpga_arria5_defconfig +++ b/configs/socfpga_arria5_defconfig @@ -7,6 +7,7 @@ CONFIG_SPL=y CONFIG_SPL_SYS_MALLOC_SIMPLE=y CONFIG_SPL_STACK_R=y CONFIG_FIT=y +CONFIG_VERSION_VARIABLE=y CONFIG_HUSH_PARSER=y CONFIG_CMD_BOOTZ=y # CONFIG_CMD_IMLS is not set diff --git a/configs/socfpga_cyclone5_defconfig b/configs/socfpga_cyclone5_defconfig index a0ae8fcedac..b34e7e5e579 100644 --- a/configs/socfpga_cyclone5_defconfig +++ b/configs/socfpga_cyclone5_defconfig @@ -7,6 +7,7 @@ CONFIG_SPL=y CONFIG_SPL_SYS_MALLOC_SIMPLE=y CONFIG_SPL_STACK_R=y CONFIG_FIT=y +CONFIG_VERSION_VARIABLE=y CONFIG_HUSH_PARSER=y CONFIG_CMD_BOOTZ=y # CONFIG_CMD_IMLS is not set diff --git a/configs/socfpga_de0_nano_soc_defconfig b/configs/socfpga_de0_nano_soc_defconfig index 5ba63c12ff5..127f36ceb38 100644 --- a/configs/socfpga_de0_nano_soc_defconfig +++ b/configs/socfpga_de0_nano_soc_defconfig @@ -7,6 +7,7 @@ CONFIG_SPL=y CONFIG_SPL_SYS_MALLOC_SIMPLE=y CONFIG_SPL_STACK_R=y CONFIG_FIT=y +CONFIG_VERSION_VARIABLE=y CONFIG_HUSH_PARSER=y CONFIG_CMD_BOOTZ=y # CONFIG_CMD_IMLS is not set diff --git a/configs/socfpga_is1_defconfig b/configs/socfpga_is1_defconfig index 30671c798e4..d23afbfe4d1 100644 --- a/configs/socfpga_is1_defconfig +++ b/configs/socfpga_is1_defconfig @@ -6,6 +6,7 @@ CONFIG_DEFAULT_DEVICE_TREE="socfpga_cyclone5_is1" CONFIG_SPL=y CONFIG_SPL_STACK_R=y CONFIG_FIT=y +CONFIG_VERSION_VARIABLE=y CONFIG_HUSH_PARSER=y CONFIG_CMD_BOOTZ=y # CONFIG_CMD_IMLS is not set diff --git a/configs/socfpga_mcvevk_defconfig b/configs/socfpga_mcvevk_defconfig index 8bd3ce7cd5e..01007268f8f 100644 --- a/configs/socfpga_mcvevk_defconfig +++ b/configs/socfpga_mcvevk_defconfig @@ -7,6 +7,7 @@ CONFIG_SPL=y CONFIG_SPL_SYS_MALLOC_SIMPLE=y CONFIG_SPL_STACK_R=y CONFIG_FIT=y +CONFIG_VERSION_VARIABLE=y CONFIG_HUSH_PARSER=y CONFIG_CMD_BOOTZ=y # CONFIG_CMD_IMLS is not set diff --git a/configs/socfpga_sockit_defconfig b/configs/socfpga_sockit_defconfig index 9c1d50925e4..d708e1366cd 100644 --- a/configs/socfpga_sockit_defconfig +++ b/configs/socfpga_sockit_defconfig @@ -7,6 +7,7 @@ CONFIG_SPL=y CONFIG_SPL_SYS_MALLOC_SIMPLE=y CONFIG_SPL_STACK_R=y CONFIG_FIT=y +CONFIG_VERSION_VARIABLE=y CONFIG_HUSH_PARSER=y CONFIG_CMD_BOOTZ=y # CONFIG_CMD_IMLS is not set diff --git a/configs/socfpga_socrates_defconfig b/configs/socfpga_socrates_defconfig index 97d865075a3..35dad706281 100644 --- a/configs/socfpga_socrates_defconfig +++ b/configs/socfpga_socrates_defconfig @@ -7,6 +7,7 @@ CONFIG_SPL=y CONFIG_SPL_SYS_MALLOC_SIMPLE=y CONFIG_SPL_STACK_R=y CONFIG_FIT=y +CONFIG_VERSION_VARIABLE=y CONFIG_HUSH_PARSER=y CONFIG_CMD_BOOTZ=y # CONFIG_CMD_IMLS is not set diff --git a/configs/socfpga_sr1500_defconfig b/configs/socfpga_sr1500_defconfig index 7701ea1d938..2a4494f484b 100644 --- a/configs/socfpga_sr1500_defconfig +++ b/configs/socfpga_sr1500_defconfig @@ -7,6 +7,7 @@ CONFIG_SPL=y CONFIG_SPL_SYS_MALLOC_SIMPLE=y CONFIG_SPL_STACK_R=y CONFIG_FIT=y +CONFIG_VERSION_VARIABLE=y CONFIG_HUSH_PARSER=y CONFIG_CMD_BOOTZ=y # CONFIG_CMD_IMLS is not set diff --git a/configs/socfpga_vining_fpga_defconfig b/configs/socfpga_vining_fpga_defconfig index d021a59ee15..7fdaeca282e 100644 --- a/configs/socfpga_vining_fpga_defconfig +++ b/configs/socfpga_vining_fpga_defconfig @@ -8,6 +8,7 @@ CONFIG_SPL_SYS_MALLOC_SIMPLE=y CONFIG_SPL_STACK_R=y CONFIG_FIT=y CONFIG_BOOTDELAY=5 +CONFIG_VERSION_VARIABLE=y CONFIG_HUSH_PARSER=y CONFIG_CMD_BOOTZ=y # CONFIG_CMD_IMLS is not set diff --git a/configs/stout_defconfig b/configs/stout_defconfig index a8d55225e70..9b03eb3d3cd 100644 --- a/configs/stout_defconfig +++ b/configs/stout_defconfig @@ -6,6 +6,7 @@ CONFIG_BOOTSTAGE_USER_COUNT=0x20 CONFIG_BOOTSTAGE_STASH_ADDR=0x0 CONFIG_BOOTSTAGE_STASH_SIZE=0x4096 CONFIG_BOOTDELAY=3 +CONFIG_VERSION_VARIABLE=y CONFIG_CMD_BOOTZ=y # CONFIG_CMD_IMI is not set # CONFIG_CMD_IMLS is not set diff --git a/configs/suvd3_defconfig b/configs/suvd3_defconfig index ac6a9e2ebf0..86c258ba7d6 100644 --- a/configs/suvd3_defconfig +++ b/configs/suvd3_defconfig @@ -4,6 +4,7 @@ CONFIG_TARGET_SUVD3=y CONFIG_OF_BOARD_SETUP=y CONFIG_OF_STDOUT_VIA_ALIAS=y CONFIG_SYS_EXTRA_OPTIONS="SUVD3" +CONFIG_VERSION_VARIABLE=y CONFIG_HUSH_PARSER=y CONFIG_AUTOBOOT_KEYED=y CONFIG_AUTOBOOT_PROMPT="Hit <SPACE> key to stop autoboot in %2ds\n" diff --git a/configs/sycamore_defconfig b/configs/sycamore_defconfig index 5f7b40d8963..f927c4c69f7 100644 --- a/configs/sycamore_defconfig +++ b/configs/sycamore_defconfig @@ -3,6 +3,7 @@ CONFIG_4xx=y CONFIG_TARGET_WALNUT=y CONFIG_OF_BOARD_SETUP=y CONFIG_BOOTDELAY=5 +CONFIG_VERSION_VARIABLE=y CONFIG_HUSH_PARSER=y CONFIG_CMD_ASKENV=y CONFIG_CMD_GREPENV=y diff --git a/configs/t3corp_defconfig b/configs/t3corp_defconfig index 750599689f0..3e040317ff1 100644 --- a/configs/t3corp_defconfig +++ b/configs/t3corp_defconfig @@ -4,6 +4,7 @@ CONFIG_TARGET_T3CORP=y CONFIG_FIT=y CONFIG_OF_BOARD_SETUP=y CONFIG_BOOTDELAY=5 +CONFIG_VERSION_VARIABLE=y CONFIG_HUSH_PARSER=y CONFIG_CMD_ASKENV=y CONFIG_CMD_GREPENV=y diff --git a/configs/ti814x_evm_defconfig b/configs/ti814x_evm_defconfig index ef9c0748c97..122dc3de968 100644 --- a/configs/ti814x_evm_defconfig +++ b/configs/ti814x_evm_defconfig @@ -2,6 +2,7 @@ CONFIG_ARM=y CONFIG_TARGET_TI814X_EVM=y CONFIG_SPL=y CONFIG_BOOTDELAY=1 +CONFIG_VERSION_VARIABLE=y CONFIG_HUSH_PARSER=y CONFIG_SYS_PROMPT="U-Boot# " # CONFIG_CMD_IMLS is not set diff --git a/configs/ti816x_evm_defconfig b/configs/ti816x_evm_defconfig index c4240e900a1..7df29cc2928 100644 --- a/configs/ti816x_evm_defconfig +++ b/configs/ti816x_evm_defconfig @@ -2,6 +2,7 @@ CONFIG_ARM=y CONFIG_TARGET_TI816X_EVM=y CONFIG_SPL=y CONFIG_BOOTDELAY=3 +CONFIG_VERSION_VARIABLE=y CONFIG_HUSH_PARSER=y CONFIG_SYS_PROMPT="u-boot/ti816x# " # CONFIG_CMD_IMLS is not set diff --git a/configs/tplink_wdr4300_defconfig b/configs/tplink_wdr4300_defconfig index b1b069db401..76a615c2c0c 100644 --- a/configs/tplink_wdr4300_defconfig +++ b/configs/tplink_wdr4300_defconfig @@ -4,6 +4,7 @@ CONFIG_ARCH_ATH79=y CONFIG_BOARD_TPLINK_WDR4300=y CONFIG_DEFAULT_DEVICE_TREE="tplink_wdr4300" CONFIG_BOOTDELAY=3 +CONFIG_VERSION_VARIABLE=y CONFIG_HUSH_PARSER=y # CONFIG_CMD_ELF is not set # CONFIG_CMD_IMLS is not set diff --git a/configs/tuge1_defconfig b/configs/tuge1_defconfig index 475cf473ee7..a042cf2f8f1 100644 --- a/configs/tuge1_defconfig +++ b/configs/tuge1_defconfig @@ -4,6 +4,7 @@ CONFIG_TARGET_TUXX1=y CONFIG_OF_BOARD_SETUP=y CONFIG_OF_STDOUT_VIA_ALIAS=y CONFIG_SYS_EXTRA_OPTIONS="TUGE1" +CONFIG_VERSION_VARIABLE=y CONFIG_HUSH_PARSER=y CONFIG_AUTOBOOT_KEYED=y CONFIG_AUTOBOOT_PROMPT="Hit <SPACE> key to stop autoboot in %2ds\n" diff --git a/configs/tuxx1_defconfig b/configs/tuxx1_defconfig index e2d86d9f632..f3f7857f597 100644 --- a/configs/tuxx1_defconfig +++ b/configs/tuxx1_defconfig @@ -4,6 +4,7 @@ CONFIG_TARGET_TUXX1=y CONFIG_OF_BOARD_SETUP=y CONFIG_OF_STDOUT_VIA_ALIAS=y CONFIG_SYS_EXTRA_OPTIONS="TUXX1" +CONFIG_VERSION_VARIABLE=y CONFIG_HUSH_PARSER=y CONFIG_AUTOBOOT_KEYED=y CONFIG_AUTOBOOT_PROMPT="Hit <SPACE> key to stop autoboot in %2ds\n" diff --git a/configs/walnut_defconfig b/configs/walnut_defconfig index 5f7b40d8963..f927c4c69f7 100644 --- a/configs/walnut_defconfig +++ b/configs/walnut_defconfig @@ -3,6 +3,7 @@ CONFIG_4xx=y CONFIG_TARGET_WALNUT=y CONFIG_OF_BOARD_SETUP=y CONFIG_BOOTDELAY=5 +CONFIG_VERSION_VARIABLE=y CONFIG_HUSH_PARSER=y CONFIG_CMD_ASKENV=y CONFIG_CMD_GREPENV=y diff --git a/configs/work_92105_defconfig b/configs/work_92105_defconfig index 58771f44787..0c2fb997e0d 100644 --- a/configs/work_92105_defconfig +++ b/configs/work_92105_defconfig @@ -3,6 +3,7 @@ CONFIG_TARGET_WORK_92105=y CONFIG_SPL=y CONFIG_SPL_SYS_MALLOC_SIMPLE=y CONFIG_BOOTDELAY=3 +CONFIG_VERSION_VARIABLE=y CONFIG_HUSH_PARSER=y # CONFIG_CMD_IMLS is not set # CONFIG_CMD_FLASH is not set diff --git a/configs/xfi3_defconfig b/configs/xfi3_defconfig index 31a647e2e71..bc0828cc08f 100644 --- a/configs/xfi3_defconfig +++ b/configs/xfi3_defconfig @@ -2,6 +2,7 @@ CONFIG_ARM=y CONFIG_TARGET_XFI3=y CONFIG_SPL=y CONFIG_BOOTDELAY=3 +CONFIG_VERSION_VARIABLE=y CONFIG_HUSH_PARSER=y # CONFIG_CMD_IMLS is not set # CONFIG_CMD_FLASH is not set diff --git a/configs/xilinx-ppc405-generic_defconfig b/configs/xilinx-ppc405-generic_defconfig index 8e07d4001e3..a17cd4fa6ee 100644 --- a/configs/xilinx-ppc405-generic_defconfig +++ b/configs/xilinx-ppc405-generic_defconfig @@ -6,6 +6,7 @@ CONFIG_FIT=y CONFIG_FIT_VERBOSE=y CONFIG_SYS_EXTRA_OPTIONS="SYS_TEXT_BASE=0x04000000,RESET_VECTOR_ADDRESS=0x04100000" CONFIG_BOOTDELAY=5 +CONFIG_VERSION_VARIABLE=y CONFIG_HUSH_PARSER=y CONFIG_SYS_PROMPT="xlx-ppc405:/# " # CONFIG_CMD_IMLS is not set diff --git a/configs/xilinx-ppc440-generic_defconfig b/configs/xilinx-ppc440-generic_defconfig index 7f085de146d..a9dd5a7a87c 100644 --- a/configs/xilinx-ppc440-generic_defconfig +++ b/configs/xilinx-ppc440-generic_defconfig @@ -6,6 +6,7 @@ CONFIG_FIT=y CONFIG_FIT_VERBOSE=y CONFIG_SYS_EXTRA_OPTIONS="SYS_TEXT_BASE=0x04000000,RESET_VECTOR_ADDRESS=0x04100000,BOOT_FROM_XMD=1" CONFIG_BOOTDELAY=5 +CONFIG_VERSION_VARIABLE=y CONFIG_HUSH_PARSER=y CONFIG_SYS_PROMPT="board:/# " CONFIG_CMD_ASKENV=y diff --git a/configs/xtfpga_defconfig b/configs/xtfpga_defconfig index 9a78bd5c290..129a62e0e94 100644 --- a/configs/xtfpga_defconfig +++ b/configs/xtfpga_defconfig @@ -2,6 +2,7 @@ CONFIG_XTENSA=y CONFIG_SYS_CPU="dc233c" CONFIG_XTFPGA_KC705=y CONFIG_BOOTDELAY=10 +CONFIG_VERSION_VARIABLE=y CONFIG_SYS_PROMPT="U-Boot> " CONFIG_AUTOBOOT_KEYED=y CONFIG_AUTOBOOT_PROMPT="Autobooting in %d seconds, press <SPACE> to stop\n" diff --git a/configs/yellowstone_defconfig b/configs/yellowstone_defconfig index 059ff711752..8c061e9555c 100644 --- a/configs/yellowstone_defconfig +++ b/configs/yellowstone_defconfig @@ -4,6 +4,7 @@ CONFIG_TARGET_YOSEMITE=y CONFIG_OF_BOARD_SETUP=y CONFIG_SYS_EXTRA_OPTIONS="YELLOWSTONE" CONFIG_BOOTDELAY=5 +CONFIG_VERSION_VARIABLE=y CONFIG_HUSH_PARSER=y CONFIG_CMD_ASKENV=y CONFIG_CMD_GREPENV=y diff --git a/configs/yosemite_defconfig b/configs/yosemite_defconfig index 9dffc9be94c..1c94e7add33 100644 --- a/configs/yosemite_defconfig +++ b/configs/yosemite_defconfig @@ -4,6 +4,7 @@ CONFIG_TARGET_YOSEMITE=y CONFIG_OF_BOARD_SETUP=y CONFIG_SYS_EXTRA_OPTIONS="YOSEMITE" CONFIG_BOOTDELAY=5 +CONFIG_VERSION_VARIABLE=y CONFIG_HUSH_PARSER=y CONFIG_CMD_ASKENV=y CONFIG_CMD_GREPENV=y diff --git a/configs/yucca_defconfig b/configs/yucca_defconfig index d3ccad7d098..c261b3230f8 100644 --- a/configs/yucca_defconfig +++ b/configs/yucca_defconfig @@ -3,6 +3,7 @@ CONFIG_4xx=y CONFIG_TARGET_YUCCA=y CONFIG_OF_BOARD_SETUP=y CONFIG_BOOTDELAY=5 +CONFIG_VERSION_VARIABLE=y CONFIG_HUSH_PARSER=y CONFIG_CMD_ASKENV=y CONFIG_CMD_GREPENV=y diff --git a/include/configs/10m50_devboard.h b/include/configs/10m50_devboard.h index 7eb9e982846..ebe018ab5cd 100644 --- a/include/configs/10m50_devboard.h +++ b/include/configs/10m50_devboard.h @@ -96,7 +96,6 @@ CONFIG_ENV_SIZE - \ CONFIG_SYS_MALLOC_LEN - \ 0x10000) -#define CONFIG_VERSION_VARIABLE #define CONFIG_AUTO_COMPLETE #define CONFIG_CMDLINE_EDITING diff --git a/include/configs/3c120_devboard.h b/include/configs/3c120_devboard.h index 6489de3e777..b2126a6b16c 100644 --- a/include/configs/3c120_devboard.h +++ b/include/configs/3c120_devboard.h @@ -99,7 +99,6 @@ CONFIG_ENV_SIZE - \ CONFIG_SYS_MALLOC_LEN - \ 0x10000) -#define CONFIG_VERSION_VARIABLE #define CONFIG_AUTO_COMPLETE #define CONFIG_CMDLINE_EDITING diff --git a/include/configs/CPCI2DP.h b/include/configs/CPCI2DP.h index 8010f28e435..603de33a507 100644 --- a/include/configs/CPCI2DP.h +++ b/include/configs/CPCI2DP.h @@ -98,8 +98,6 @@ #define CONFIG_SYS_LOAD_ADDR 0x100000 /* default load address */ #define CONFIG_SYS_EXTBDINFO 1 /* To use extended board_into (bd_t) */ -#define CONFIG_VERSION_VARIABLE 1 /* include version env variable */ - #define CONFIG_SYS_RX_ETH_BUFFER 16 /* use 16 rx buffer on 405 emac */ /*----------------------------------------------------------------------- diff --git a/include/configs/CPCI4052.h b/include/configs/CPCI4052.h index ffae107a9a8..06c5d3bd301 100644 --- a/include/configs/CPCI4052.h +++ b/include/configs/CPCI4052.h @@ -121,8 +121,6 @@ #define CONFIG_CMDLINE_EDITING /* add command line history */ -#define CONFIG_VERSION_VARIABLE 1 /* include version env variable */ - #define CONFIG_SYS_RX_ETH_BUFFER 16 /* use 16 rx buffer on 405 emac */ /*----------------------------------------------------------------------- diff --git a/include/configs/MigoR.h b/include/configs/MigoR.h index 80d8fcdd98f..a4eabe5813d 100644 --- a/include/configs/MigoR.h +++ b/include/configs/MigoR.h @@ -18,7 +18,6 @@ #define CONFIG_BAUDRATE 115200 #define CONFIG_BOOTARGS "console=ttySC0,115200 root=1f01" -#define CONFIG_VERSION_VARIABLE #undef CONFIG_SHOW_BOOT_PROGRESS /* SMC9111 */ diff --git a/include/configs/PLU405.h b/include/configs/PLU405.h index c9b0528779b..391a697735b 100644 --- a/include/configs/PLU405.h +++ b/include/configs/PLU405.h @@ -118,8 +118,6 @@ #define CONFIG_CMDLINE_EDITING 1 /* add command line history */ -#define CONFIG_VERSION_VARIABLE 1 /* include version env variable */ - #define CONFIG_SYS_RX_ETH_BUFFER 16 /* use 16 rx buffer on 405 emac */ /* diff --git a/include/configs/PMC405DE.h b/include/configs/PMC405DE.h index 619222fed7d..0b0db207da0 100644 --- a/include/configs/PMC405DE.h +++ b/include/configs/PMC405DE.h @@ -92,7 +92,6 @@ #define CONFIG_CMDLINE_EDITING 1 /* add command line history */ #define CONFIG_MX_CYCLIC 1 /* enable mdc/mwc commands */ -#define CONFIG_VERSION_VARIABLE 1 /* include version env variable */ /* * PCI stuff diff --git a/include/configs/PMC440.h b/include/configs/PMC440.h index 7c05ebb70bb..956c7879860 100644 --- a/include/configs/PMC440.h +++ b/include/configs/PMC440.h @@ -311,7 +311,6 @@ #define CONFIG_CMDLINE_EDITING 1 /* add command line history */ #define CONFIG_MX_CYCLIC 1 /* enable mdc/mwc commands */ -#define CONFIG_VERSION_VARIABLE 1 /* include version env variable */ /*----------------------------------------------------------------------- * PCI stuff diff --git a/include/configs/VOM405.h b/include/configs/VOM405.h index e87cea8393f..5e3051109bf 100644 --- a/include/configs/VOM405.h +++ b/include/configs/VOM405.h @@ -106,8 +106,6 @@ #define CONFIG_CMDLINE_EDITING 1 /* add command line history */ -#define CONFIG_VERSION_VARIABLE 1 /* include version env variable */ - #define CONFIG_SYS_RX_ETH_BUFFER 16 /* use 16 rx buffer on 405 emac */ /* diff --git a/include/configs/am335x_shc.h b/include/configs/am335x_shc.h index f2484cb1702..9327c3d729e 100644 --- a/include/configs/am335x_shc.h +++ b/include/configs/am335x_shc.h @@ -58,8 +58,6 @@ #define V_OSCK 24000000 /* Clock output from T2 */ #define V_SCLK (V_OSCK) -#define CONFIG_VERSION_VARIABLE - #define CONFIG_ENV_IS_IN_MMC 1 /* diff --git a/include/configs/am3517_evm.h b/include/configs/am3517_evm.h index 4faec82de04..98c29b0d666 100644 --- a/include/configs/am3517_evm.h +++ b/include/configs/am3517_evm.h @@ -265,7 +265,6 @@ /* Miscellaneous configurable options */ #define CONFIG_AUTO_COMPLETE #define CONFIG_CMDLINE_EDITING -#define CONFIG_VERSION_VARIABLE #define CONFIG_SYS_LONGHELP #define CONFIG_PARTITION_UUIDS diff --git a/include/configs/amcc-common.h b/include/configs/amcc-common.h index 9bda7faa902..f4261e90ba2 100644 --- a/include/configs/amcc-common.h +++ b/include/configs/amcc-common.h @@ -78,7 +78,6 @@ #define CONFIG_CMDLINE_EDITING /* add command line history */ #define CONFIG_AUTO_COMPLETE /* add autocompletion support */ #define CONFIG_MX_CYCLIC /* enable mdc/mwc commands */ -#define CONFIG_VERSION_VARIABLE /* include version env variable */ #define CONFIG_SYS_CONSOLE_INFO_QUIET /* don't print console @ startup*/ #define CONFIG_LOADS_ECHO /* echo on for serial download */ diff --git a/include/configs/ap325rxa.h b/include/configs/ap325rxa.h index 7dd24612f1a..32acb080c0a 100644 --- a/include/configs/ap325rxa.h +++ b/include/configs/ap325rxa.h @@ -21,7 +21,6 @@ #define CONFIG_BAUDRATE 38400 #define CONFIG_BOOTARGS "console=ttySC2,38400" -#define CONFIG_VERSION_VARIABLE #undef CONFIG_SHOW_BOOT_PROGRESS /* SMC9118 */ diff --git a/include/configs/ap_sh4a_4a.h b/include/configs/ap_sh4a_4a.h index 37f2d3093a7..d41b6244054 100644 --- a/include/configs/ap_sh4a_4a.h +++ b/include/configs/ap_sh4a_4a.h @@ -24,7 +24,6 @@ #define CONFIG_BAUDRATE 115200 #define CONFIG_BOOTARGS "console=ttySC4,115200" -#define CONFIG_VERSION_VARIABLE #undef CONFIG_SHOW_BOOT_PROGRESS /* Ether */ diff --git a/include/configs/apf27.h b/include/configs/apf27.h index 51a16eba1f1..e84cfb5d436 100644 --- a/include/configs/apf27.h +++ b/include/configs/apf27.h @@ -10,7 +10,6 @@ #ifndef __CONFIG_H #define __CONFIG_H -#define CONFIG_VERSION_VARIABLE #define CONFIG_ENV_VERSION 10 #define CONFIG_IDENT_STRING " apf27 patch 3.10" #define CONFIG_BOARD_NAME apf27 diff --git a/include/configs/armadillo-800eva.h b/include/configs/armadillo-800eva.h index e9cab5c6953..e3f4a7b5360 100644 --- a/include/configs/armadillo-800eva.h +++ b/include/configs/armadillo-800eva.h @@ -24,7 +24,6 @@ #define CONFIG_BAUDRATE 115200 #define CONFIG_BOOTARGS "" -#define CONFIG_VERSION_VARIABLE #undef CONFIG_SHOW_BOOT_PROGRESS #define CONFIG_ARCH_CPU_INIT diff --git a/include/configs/bcm23550_w1d.h b/include/configs/bcm23550_w1d.h index b9688014cd2..eb4c497c94a 100644 --- a/include/configs/bcm23550_w1d.h +++ b/include/configs/bcm23550_w1d.h @@ -113,7 +113,6 @@ #define CONFIG_EFI_PARTITION /* version string, parser, etc */ -#define CONFIG_VERSION_VARIABLE #define CONFIG_AUTO_COMPLETE #define CONFIG_CMDLINE_EDITING #define CONFIG_SYS_LONGHELP diff --git a/include/configs/bcm28155_ap.h b/include/configs/bcm28155_ap.h index f38f0813556..7a75fdb3f4a 100644 --- a/include/configs/bcm28155_ap.h +++ b/include/configs/bcm28155_ap.h @@ -112,7 +112,6 @@ #define CONFIG_EFI_PARTITION /* version string, parser, etc */ -#define CONFIG_VERSION_VARIABLE #define CONFIG_AUTO_COMPLETE #define CONFIG_CMDLINE_EDITING #define CONFIG_SYS_LONGHELP diff --git a/include/configs/bcm_ep_board.h b/include/configs/bcm_ep_board.h index 4b255d8d778..b68fa1e4435 100644 --- a/include/configs/bcm_ep_board.h +++ b/include/configs/bcm_ep_board.h @@ -68,7 +68,6 @@ #define CONFIG_DOS_PARTITION /* version string, parser, etc */ -#define CONFIG_VERSION_VARIABLE #define CONFIG_AUTO_COMPLETE #define CONFIG_CMDLINE_EDITING #define CONFIG_COMMAND_HISTORY diff --git a/include/configs/bur_cfg_common.h b/include/configs/bur_cfg_common.h index 22c32496aad..85510f05bc1 100644 --- a/include/configs/bur_cfg_common.h +++ b/include/configs/bur_cfg_common.h @@ -48,7 +48,6 @@ #define CONFIG_SYS_LONGHELP #define CONFIG_AUTO_COMPLETE #define CONFIG_CMDLINE_EDITING -#define CONFIG_VERSION_VARIABLE /* We set the max number of command args high to avoid HUSH bugs. */ #define CONFIG_SYS_MAXARGS 64 diff --git a/include/configs/calimain.h b/include/configs/calimain.h index 9c2b9e8caf5..bf173ff0843 100644 --- a/include/configs/calimain.h +++ b/include/configs/calimain.h @@ -198,7 +198,6 @@ #define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE /* Boot Args Buffer Size */ #define CONFIG_SYS_LOAD_ADDR (PHYS_SDRAM_1 + 0x700000) #define CONFIG_LOADADDR 0xc0700000 -#define CONFIG_VERSION_VARIABLE #define CONFIG_AUTO_COMPLETE #define CONFIG_CMDLINE_EDITING #define CONFIG_SYS_LONGHELP diff --git a/include/configs/colibri_vf.h b/include/configs/colibri_vf.h index 9eed333a929..d3e4523af88 100644 --- a/include/configs/colibri_vf.h +++ b/include/configs/colibri_vf.h @@ -39,7 +39,6 @@ /* Allow to overwrite serial and ethaddr */ #define CONFIG_ENV_OVERWRITE #define CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG -#define CONFIG_VERSION_VARIABLE #define CONFIG_BAUDRATE 115200 /* NAND support */ diff --git a/include/configs/da850evm.h b/include/configs/da850evm.h index 3e4bba55872..ef0fd5979e7 100644 --- a/include/configs/da850evm.h +++ b/include/configs/da850evm.h @@ -261,7 +261,6 @@ #define CONFIG_SYS_MAXARGS 16 /* max number of command args */ #define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE /* Boot Args Buffer Size */ #define CONFIG_SYS_LOAD_ADDR (PHYS_SDRAM_1 + 0x700000) -#define CONFIG_VERSION_VARIABLE #define CONFIG_AUTO_COMPLETE #define CONFIG_CMDLINE_EDITING #define CONFIG_SYS_LONGHELP diff --git a/include/configs/devkit3250.h b/include/configs/devkit3250.h index 046302236d7..abf1394eab8 100644 --- a/include/configs/devkit3250.h +++ b/include/configs/devkit3250.h @@ -137,7 +137,6 @@ #define CONFIG_AUTO_COMPLETE #define CONFIG_CMDLINE_EDITING -#define CONFIG_VERSION_VARIABLE #define CONFIG_DISPLAY_CPUINFO #define CONFIG_DOS_PARTITION diff --git a/include/configs/ea20.h b/include/configs/ea20.h index 3f8578fd58e..910bcd40289 100644 --- a/include/configs/ea20.h +++ b/include/configs/ea20.h @@ -124,7 +124,6 @@ #define CONFIG_SYS_MAXARGS 16 /* max number of command args */ #define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE /* Boot Args Buffer Size */ #define CONFIG_SYS_LOAD_ADDR (PHYS_SDRAM_1 + 0x700000) -#define CONFIG_VERSION_VARIABLE #define CONFIG_AUTO_COMPLETE #define CONFIG_CMDLINE_EDITING #define CONFIG_SYS_LONGHELP diff --git a/include/configs/ecovec.h b/include/configs/ecovec.h index 1e0bf7b72ab..c8508fff2d2 100644 --- a/include/configs/ecovec.h +++ b/include/configs/ecovec.h @@ -38,7 +38,6 @@ #define CONFIG_BAUDRATE 115200 #define CONFIG_BOOTARGS "console=ttySC0,115200" -#define CONFIG_VERSION_VARIABLE #undef CONFIG_SHOW_BOOT_PROGRESS /* I2C */ diff --git a/include/configs/espt.h b/include/configs/espt.h index 86e726c63c5..e76a4ee1bb1 100644 --- a/include/configs/espt.h +++ b/include/configs/espt.h @@ -23,7 +23,6 @@ #define CONFIG_BOOTARGS "console=ttySC0,115200 root=1f01" #define CONFIG_ENV_OVERWRITE 1 -#define CONFIG_VERSION_VARIABLE #undef CONFIG_SHOW_BOOT_PROGRESS /* SCIF */ diff --git a/include/configs/ids8313.h b/include/configs/ids8313.h index b750d72d35b..c9d3b93fb52 100644 --- a/include/configs/ids8313.h +++ b/include/configs/ids8313.h @@ -545,8 +545,6 @@ #define CONFIG_BOOTCOUNT_ALEN 1 #define CONFIG_SYS_BOOTCOUNT_ADDR 0x9 -#define CONFIG_VERSION_VARIABLE - #define CONFIG_IMAGE_FORMAT_LEGACY #define CONFIG_CMD_HASH #define CONFIG_SHA1 diff --git a/include/configs/ipam390.h b/include/configs/ipam390.h index b36b75dfb68..37a5fa40f19 100644 --- a/include/configs/ipam390.h +++ b/include/configs/ipam390.h @@ -208,7 +208,6 @@ #define CONFIG_SYS_MAXARGS 16 /* max number of command args */ #define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE /* Boot Args Buffer Size */ #define CONFIG_SYS_LOAD_ADDR (PHYS_SDRAM_1 + 0x700000) -#define CONFIG_VERSION_VARIABLE #define CONFIG_AUTO_COMPLETE #define CONFIG_CMDLINE_EDITING #define CONFIG_SYS_LONGHELP diff --git a/include/configs/km/keymile-common.h b/include/configs/km/keymile-common.h index 6f2773b88c1..8e1de7c8179 100644 --- a/include/configs/km/keymile-common.h +++ b/include/configs/km/keymile-common.h @@ -237,6 +237,4 @@ "" #endif /* CONFIG_KM_DEF_ENV */ -#define CONFIG_VERSION_VARIABLE /* include version env variable */ - #endif /* __CONFIG_KEYMILE_H */ diff --git a/include/configs/kzm9g.h b/include/configs/kzm9g.h index a4b296ab8ff..409c30d9d7e 100644 --- a/include/configs/kzm9g.h +++ b/include/configs/kzm9g.h @@ -30,7 +30,6 @@ #define CONFIG_BAUDRATE 115200 #define CONFIG_BOOTARGS "root=/dev/null console=ttySC4,115200" -#define CONFIG_VERSION_VARIABLE #undef CONFIG_SHOW_BOOT_PROGRESS /* MEMORY */ diff --git a/include/configs/legoev3.h b/include/configs/legoev3.h index 04f593e58b3..d91e75dd3fd 100644 --- a/include/configs/legoev3.h +++ b/include/configs/legoev3.h @@ -151,7 +151,6 @@ #define CONFIG_SYS_MAXARGS 16 /* max number of command args */ #define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE /* Boot Args Buffer Size */ #define CONFIG_SYS_LOAD_ADDR (PHYS_SDRAM_1 + 0x700000) -#define CONFIG_VERSION_VARIABLE #define CONFIG_AUTO_COMPLETE #define CONFIG_CMDLINE_EDITING #define CONFIG_SYS_LONGHELP diff --git a/include/configs/lwmon5.h b/include/configs/lwmon5.h index d41ae699fbe..da638428a6f 100644 --- a/include/configs/lwmon5.h +++ b/include/configs/lwmon5.h @@ -436,7 +436,6 @@ #define CONFIG_CMDLINE_EDITING 1 /* add command line history */ #define CONFIG_MX_CYCLIC 1 /* enable mdc/mwc commands */ -#define CONFIG_VERSION_VARIABLE 1 /* include version env variable */ #define CONFIG_SYS_CONSOLE_INFO_QUIET /* don't print console @ startup*/ diff --git a/include/configs/m53evk.h b/include/configs/m53evk.h index f6bb56107ee..fd47a72cd5f 100644 --- a/include/configs/m53evk.h +++ b/include/configs/m53evk.h @@ -70,7 +70,6 @@ #define CONFIG_SYS_MAXARGS 32 /* Max number of command args */ #define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE /* Boot argument buffer size */ -#define CONFIG_VERSION_VARIABLE /* U-BOOT version */ #define CONFIG_AUTO_COMPLETE /* Command auto complete */ #define CONFIG_CMDLINE_EDITING /* Command history etc */ diff --git a/include/configs/ma5d4evk.h b/include/configs/ma5d4evk.h index cda9464ff47..a696c1a688b 100644 --- a/include/configs/ma5d4evk.h +++ b/include/configs/ma5d4evk.h @@ -51,7 +51,6 @@ /* * U-Boot general configurations */ -#define CONFIG_VERSION_VARIABLE /* U-BOOT version */ /* * Serial Driver diff --git a/include/configs/motionpro.h b/include/configs/motionpro.h index 2a83c608b1c..bad85ba3621 100644 --- a/include/configs/motionpro.h +++ b/include/configs/motionpro.h @@ -67,8 +67,6 @@ #define CONFIG_CMDLINE_EDITING 1 /* add command line history */ -#define CONFIG_VERSION_VARIABLE 1 /* include version env variable */ - /* * Default environment settings */ diff --git a/include/configs/mpr2.h b/include/configs/mpr2.h index 3f2bfa47e43..1a8909a8ad1 100644 --- a/include/configs/mpr2.h +++ b/include/configs/mpr2.h @@ -17,7 +17,6 @@ #define CONFIG_BOOTARGS "console=ttySC0,115200" #define CONFIG_BOOTFILE "/boot/zImage" #define CONFIG_LOADADDR 0x8E000000 -#define CONFIG_VERSION_VARIABLE /* CPU and platform */ #define CONFIG_CPU_SH7720 1 diff --git a/include/configs/ms7720se.h b/include/configs/ms7720se.h index 27ed1d542f3..d1367262015 100644 --- a/include/configs/ms7720se.h +++ b/include/configs/ms7720se.h @@ -21,7 +21,6 @@ #define CONFIG_BOOTFILE "/boot/zImage" #define CONFIG_LOADADDR 0x8E000000 -#define CONFIG_VERSION_VARIABLE #undef CONFIG_SHOW_BOOT_PROGRESS /* MEMORY */ diff --git a/include/configs/ms7722se.h b/include/configs/ms7722se.h index 27e9c0a8f3f..9b0c166d60d 100644 --- a/include/configs/ms7722se.h +++ b/include/configs/ms7722se.h @@ -18,7 +18,6 @@ #define CONFIG_BAUDRATE 115200 #define CONFIG_BOOTARGS "console=ttySC0,115200 root=1f01" -#define CONFIG_VERSION_VARIABLE #undef CONFIG_SHOW_BOOT_PROGRESS /* SMC9111 */ diff --git a/include/configs/mxs.h b/include/configs/mxs.h index 238b16d17f1..d80dc5e2299 100644 --- a/include/configs/mxs.h +++ b/include/configs/mxs.h @@ -94,7 +94,6 @@ #define CONFIG_SYS_MAXARGS 32 /* Max number of command args */ #define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE /* Boot argument buffer size */ -#define CONFIG_VERSION_VARIABLE /* U-BOOT version */ #define CONFIG_AUTO_COMPLETE /* Command auto complete */ #define CONFIG_CMDLINE_EDITING /* Command history etc */ diff --git a/include/configs/novena.h b/include/configs/novena.h index a1667dd072a..13a707457cf 100644 --- a/include/configs/novena.h +++ b/include/configs/novena.h @@ -27,7 +27,6 @@ #define CONFIG_VIDEO /* U-Boot general configurations */ -#define CONFIG_VERSION_VARIABLE /* U-BOOT version */ /* U-Boot environment */ #define CONFIG_ENV_SIZE (16 * 1024) diff --git a/include/configs/omapl138_lcdk.h b/include/configs/omapl138_lcdk.h index d00cf5062a2..43afecdf488 100644 --- a/include/configs/omapl138_lcdk.h +++ b/include/configs/omapl138_lcdk.h @@ -188,7 +188,6 @@ #define CONFIG_SYS_MAXARGS 16 /* max number of command args */ #define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE /* Boot Args Buffer Size */ #define CONFIG_SYS_LOAD_ADDR (PHYS_SDRAM_1 + 0x700000) -#define CONFIG_VERSION_VARIABLE #define CONFIG_AUTO_COMPLETE #define CONFIG_CMDLINE_EDITING #define CONFIG_SYS_LONGHELP diff --git a/include/configs/pengwyn.h b/include/configs/pengwyn.h index 33b23035524..909ed9d80a2 100644 --- a/include/configs/pengwyn.h +++ b/include/configs/pengwyn.h @@ -163,7 +163,6 @@ #define CONFIG_CMD_MTDPARTS -#define CONFIG_VERSION_VARIABLE /* monitor functions : u-boot version */ #define CONFIG_CMD_DIAG /* monitor functions : Diagnostics */ #define MTDIDS_DEFAULT "nand0=omap2-nand.0" diff --git a/include/configs/r0p7734.h b/include/configs/r0p7734.h index c5e57244ab8..2d7e326f512 100644 --- a/include/configs/r0p7734.h +++ b/include/configs/r0p7734.h @@ -24,7 +24,6 @@ #define CONFIG_BAUDRATE 115200 #define CONFIG_BOOTARGS "console=ttySC3,115200" -#define CONFIG_VERSION_VARIABLE #undef CONFIG_SHOW_BOOT_PROGRESS /* Ether */ diff --git a/include/configs/rcar-gen2-common.h b/include/configs/rcar-gen2-common.h index 8f91e8e0012..5733da64a90 100644 --- a/include/configs/rcar-gen2-common.h +++ b/include/configs/rcar-gen2-common.h @@ -31,7 +31,6 @@ #define CONFIG_BAUDRATE 38400 #define CONFIG_BOOTARGS "" -#define CONFIG_VERSION_VARIABLE #undef CONFIG_SHOW_BOOT_PROGRESS #define CONFIG_ARCH_CPU_INIT diff --git a/include/configs/rcar-gen3-common.h b/include/configs/rcar-gen3-common.h index f9e5f59a52a..7655417cfd6 100644 --- a/include/configs/rcar-gen3-common.h +++ b/include/configs/rcar-gen3-common.h @@ -40,7 +40,6 @@ #define CONFIG_BAUDRATE 115200 -#define CONFIG_VERSION_VARIABLE #undef CONFIG_SHOW_BOOT_PROGRESS #define CONFIG_ARCH_CPU_INIT diff --git a/include/configs/rsk7203.h b/include/configs/rsk7203.h index 1e4166ca87e..9db73d3249d 100644 --- a/include/configs/rsk7203.h +++ b/include/configs/rsk7203.h @@ -20,7 +20,6 @@ #define CONFIG_BOOTARGS "console=ttySC0,115200" #define CONFIG_LOADADDR 0x0C100000 /* RSK7203_SDRAM_BASE + 1MB */ -#define CONFIG_VERSION_VARIABLE #undef CONFIG_SHOW_BOOT_PROGRESS /* MEMORY */ diff --git a/include/configs/sh7752evb.h b/include/configs/sh7752evb.h index fb6e05fafc6..cfcde81f312 100644 --- a/include/configs/sh7752evb.h +++ b/include/configs/sh7752evb.h @@ -26,7 +26,6 @@ #define CONFIG_BAUDRATE 115200 #define CONFIG_BOOTARGS "console=ttySC2,115200 root=/dev/nfs ip=dhcp" -#define CONFIG_VERSION_VARIABLE #undef CONFIG_SHOW_BOOT_PROGRESS #define CONFIG_CMDLINE_EDITING #define CONFIG_AUTO_COMPLETE diff --git a/include/configs/sh7753evb.h b/include/configs/sh7753evb.h index 64e9e52e701..fefdbb4ff2e 100644 --- a/include/configs/sh7753evb.h +++ b/include/configs/sh7753evb.h @@ -26,7 +26,6 @@ #define CONFIG_BAUDRATE 115200 #define CONFIG_BOOTARGS "console=ttySC2,115200 root=/dev/nfs ip=dhcp" -#define CONFIG_VERSION_VARIABLE #undef CONFIG_SHOW_BOOT_PROGRESS #define CONFIG_CMDLINE_EDITING #define CONFIG_AUTO_COMPLETE diff --git a/include/configs/sh7757lcr.h b/include/configs/sh7757lcr.h index f9a9a03ef48..262d3902712 100644 --- a/include/configs/sh7757lcr.h +++ b/include/configs/sh7757lcr.h @@ -26,7 +26,6 @@ #define CONFIG_BAUDRATE 115200 #define CONFIG_BOOTARGS "console=ttySC2,115200 root=/dev/nfs ip=dhcp" -#define CONFIG_VERSION_VARIABLE #undef CONFIG_SHOW_BOOT_PROGRESS /* MEMORY */ diff --git a/include/configs/sh7763rdp.h b/include/configs/sh7763rdp.h index 538ba98ae5d..2e45699c84c 100644 --- a/include/configs/sh7763rdp.h +++ b/include/configs/sh7763rdp.h @@ -23,7 +23,6 @@ #define CONFIG_BOOTARGS "console=ttySC2,115200 root=1f01" #define CONFIG_ENV_OVERWRITE 1 -#define CONFIG_VERSION_VARIABLE #undef CONFIG_SHOW_BOOT_PROGRESS /* SCIF */ diff --git a/include/configs/sh7785lcr.h b/include/configs/sh7785lcr.h index 1c60d21913c..80e61a4f043 100644 --- a/include/configs/sh7785lcr.h +++ b/include/configs/sh7785lcr.h @@ -27,7 +27,6 @@ "bootdevice=0:1\0" \ "usbload=usb reset;usbboot;usb stop;bootm\0" -#define CONFIG_VERSION_VARIABLE #undef CONFIG_SHOW_BOOT_PROGRESS /* MEMORY */ diff --git a/include/configs/shmin.h b/include/configs/shmin.h index 897ba1d4085..e0fc3a28bff 100644 --- a/include/configs/shmin.h +++ b/include/configs/shmin.h @@ -25,7 +25,6 @@ * This board has original boot loader. If you write u-boot to 0x0, * you should set undef. */ -#define CONFIG_VERSION_VARIABLE #undef CONFIG_SHOW_BOOT_PROGRESS /* system */ diff --git a/include/configs/socfpga_common.h b/include/configs/socfpga_common.h index 81f56518c5d..b3fb245fea9 100644 --- a/include/configs/socfpga_common.h +++ b/include/configs/socfpga_common.h @@ -64,7 +64,6 @@ #define CONFIG_SYS_MAXARGS 32 /* Max number of command args */ #define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE /* Boot argument buffer size */ -#define CONFIG_VERSION_VARIABLE /* U-BOOT version */ #define CONFIG_AUTO_COMPLETE /* Command auto complete */ #define CONFIG_CMDLINE_EDITING /* Command history etc */ diff --git a/include/configs/ti814x_evm.h b/include/configs/ti814x_evm.h index 198f6493267..82ab47936c5 100644 --- a/include/configs/ti814x_evm.h +++ b/include/configs/ti814x_evm.h @@ -35,7 +35,6 @@ #define CONFIG_INITRD_TAG /* for ramdisk support */ /* commands to include */ -#define CONFIG_VERSION_VARIABLE #define CONFIG_ENV_VARS_UBOOT_CONFIG #define CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG diff --git a/include/configs/ti816x_evm.h b/include/configs/ti816x_evm.h index 071511cff59..e3cd647819a 100644 --- a/include/configs/ti816x_evm.h +++ b/include/configs/ti816x_evm.h @@ -29,7 +29,6 @@ #define CONFIG_SETUP_MEMORY_TAGS #define CONFIG_INITRD_TAG /* required for ramdisk support */ -#define CONFIG_VERSION_VARIABLE #define CONFIG_DISPLAY_CPUINFO #define CONFIG_EXTRA_ENV_SETTINGS \ diff --git a/include/configs/ti_armv7_common.h b/include/configs/ti_armv7_common.h index d60d213d544..32cb20273ab 100644 --- a/include/configs/ti_armv7_common.h +++ b/include/configs/ti_armv7_common.h @@ -160,7 +160,6 @@ #define CONFIG_SYS_LONGHELP #define CONFIG_AUTO_COMPLETE #define CONFIG_CMDLINE_EDITING -#define CONFIG_VERSION_VARIABLE /* We set the max number of command args high to avoid HUSH bugs. */ #define CONFIG_SYS_MAXARGS 64 diff --git a/include/configs/tplink_wdr4300.h b/include/configs/tplink_wdr4300.h index b2ccb700234..7bf8e4c8350 100644 --- a/include/configs/tplink_wdr4300.h +++ b/include/configs/tplink_wdr4300.h @@ -57,7 +57,6 @@ #define CONFIG_SYS_MAXARGS 32 /* Max number of command args */ #define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE /* Boot argument buffer size */ -#define CONFIG_VERSION_VARIABLE /* U-BOOT version */ #define CONFIG_AUTO_COMPLETE /* Command auto complete */ #define CONFIG_CMDLINE_EDITING /* Command history etc */ #define CONFIG_SYS_PROMPT_HUSH_PS2 "> " diff --git a/include/configs/work_92105.h b/include/configs/work_92105.h index eae7ebab0e3..b2103b49b57 100644 --- a/include/configs/work_92105.h +++ b/include/configs/work_92105.h @@ -108,7 +108,6 @@ #define CONFIG_AUTO_COMPLETE #define CONFIG_CMDLINE_EDITING -#define CONFIG_VERSION_VARIABLE #define CONFIG_DISPLAY_CPUINFO #define CONFIG_DOS_PARTITION diff --git a/include/configs/xilinx-ppc.h b/include/configs/xilinx-ppc.h index 39c1bd89d89..6c525825a4d 100644 --- a/include/configs/xilinx-ppc.h +++ b/include/configs/xilinx-ppc.h @@ -57,7 +57,6 @@ #define CONFIG_CMDLINE_EDITING /* add command line history */ #define CONFIG_AUTO_COMPLETE /* add autocompletion support */ #define CONFIG_MX_CYCLIC /* enable mdc/mwc commands */ -#define CONFIG_VERSION_VARIABLE /* include version env variable */ #define CONFIG_SYS_CONSOLE_INFO_QUIET /* don't print console @ startup */ #define CONFIG_LOADS_ECHO /* echo on for serial download */ #define CONFIG_SYS_LOADS_BAUD_CHANGE /* allow baudrate change */ diff --git a/include/configs/xtfpga.h b/include/configs/xtfpga.h index c5b06e3e0ae..3e5d310d566 100644 --- a/include/configs/xtfpga.h +++ b/include/configs/xtfpga.h @@ -140,7 +140,6 @@ #define CONFIG_BOOT_RETRY_TIME 60 /* retry after 60 secs */ -#define CONFIG_VERSION_VARIABLE #define CONFIG_AUTO_COMPLETE /* Support tab autocompletion */ #define CONFIG_CMDLINE_EDITING #define CONFIG_SYS_LONGHELP |