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 /include/configs | |
| parent | 12f05678e157ef4472b4e3611bb7ae9751487ff0 (diff) | |
| download | u-boot-9dd1d0aa4e086bc8a5eaf19a67825c3323c41c5a.tar.gz | |
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>
Diffstat (limited to 'include/configs')
61 files changed, 0 insertions, 69 deletions
diff --git a/include/configs/10m50_devboard.h b/include/configs/10m50_devboard.h index 7eb9e98284..ebe018ab5c 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 6489de3e77..b2126a6b16 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 8010f28e43..603de33a50 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 ffae107a9a..06c5d3bd30 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 80d8fcdd98..a4eabe5813 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 c9b0528779..391a697735 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 619222fed7..0b0db207da 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 7c05ebb70b..956c787986 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 e87cea8393..5e3051109b 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 f2484cb170..9327c3d729 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 4faec82de0..98c29b0d66 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 9bda7faa90..f4261e90ba 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 7dd24612f1..32acb080c0 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 37f2d3093a..d41b624405 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 51a16eba1f..e84cfb5d43 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 e9cab5c695..e3f4a7b536 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 b9688014cd..eb4c497c94 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 f38f081355..7a75fdb3f4 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 4b255d8d77..b68fa1e443 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 22c32496aa..85510f05bc 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 9c2b9e8caf..bf173ff084 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 9eed333a92..d3e4523af8 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 3e4bba5587..ef0fd5979e 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 046302236d..abf1394eab 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 3f8578fd58..910bcd4028 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 1e0bf7b72a..c8508fff2d 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 86e726c63c..e76a4ee1bb 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 b750d72d35..c9d3b93fb5 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 b36b75dfb6..37a5fa40f1 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 6f2773b88c..8e1de7c817 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 a4b296ab8f..409c30d9d7 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 04f593e58b..d91e75dd3f 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 d41ae699fb..da638428a6 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 f6bb56107e..fd47a72cd5 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 cda9464ff4..a696c1a688 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 2a83c608b1..bad85ba362 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 3f2bfa47e4..1a8909a8ad 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 27ed1d542f..d136726201 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 27e9c0a8f3..9b0c166d60 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 238b16d17f..d80dc5e229 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 a1667dd072..13a707457c 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 d00cf5062a..43afecdf48 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 33b2303552..909ed9d80a 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 c5e57244ab..2d7e326f51 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 8f91e8e001..5733da64a9 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 f9e5f59a52..7655417cfd 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 1e4166ca87..9db73d3249 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 fb6e05fafc..cfcde81f31 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 64e9e52e70..fefdbb4ff2 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 f9a9a03ef4..262d390271 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 538ba98ae5..2e45699c84 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 1c60d21913..80e61a4f04 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 897ba1d408..e0fc3a28bf 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 81f56518c5..b3fb245fea 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 198f649326..82ab47936c 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 071511cff5..e3cd647819 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 d60d213d54..32cb20273a 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 b2ccb70023..7bf8e4c835 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 eae7ebab0e..b2103b49b5 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 39c1bd89d8..6c525825a4 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 c5b06e3e0a..3e5d310d56 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 |