Cleanup CONFIG_VERSION_VARIABLE migration

CONFIG_VERSION_VARIABLE had already been mostly migrated to Kconfig,
but two headers still referenced it. Also set defaults so that
most of the defconfigs inherit the default rather than needing it
to be set explicitly.

Signed-off-by: Alex Kiernan <[email protected]>
Reviewed-by: Petr Vorel <[email protected]>

diff --git a/README b/README
index 325a58c9301658aec3a356cfef8530de7aa62b93..6f98e09e680d539246c279a18059c2f38ad7ce10 100644 (file)
--- a/README
+++ b/README
@@ -812,14 +812,6 @@ The following options need to be configured:
                CONFIG_AT91_HW_WDT_TIMEOUT
                specify the timeout in seconds. default 2 seconds.
 
-- U-Boot Version:
-               CONFIG_VERSION_VARIABLE
-               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.
-
 - Real-Time Clock:
 
                When CONFIG_CMD_DATE is selected, the type of the RTC

diff --git a/configs/apalis_imx6_defconfig b/configs/apalis_imx6_defconfig
index 57249a4785d341878a7f753723104a03118152fa..77a4008d7af77cb76440093885d327615af13ee7 100644 (file)
--- a/configs/apalis_imx6_defconfig
+++ b/configs/apalis_imx6_defconfig
@@ -14,6 +14,7 @@ CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/mach-imx/spl_sd.cfg,MX6Q"
 CONFIG_BOOTDELAY=1
 # CONFIG_CONSOLE_MUX is not set
 CONFIG_SUPPORT_RAW_INITRD=y
+CONFIG_VERSION_VARIABLE=y
 # CONFIG_DISPLAY_BOARDINFO is not set
 CONFIG_DISPLAY_BOARDINFO_LATE=y
 CONFIG_BOARD_EARLY_INIT_F=y

diff --git a/configs/apalis_imx6_nospl_com_defconfig b/configs/apalis_imx6_nospl_com_defconfig
index 976a66e91544608b98f3a53f7286594a10a9c2c2..89af27f7dcfaea8235cecf8e2a4ea378216326fd 100644 (file)
--- a/configs/apalis_imx6_nospl_com_defconfig
+++ b/configs/apalis_imx6_nospl_com_defconfig
@@ -9,6 +9,7 @@ CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/toradex/apalis_imx6/apalis_imx6q.cfg,
 CONFIG_BOOTDELAY=1
 # CONFIG_CONSOLE_MUX is not set
 CONFIG_SUPPORT_RAW_INITRD=y
+CONFIG_VERSION_VARIABLE=y
 # CONFIG_DISPLAY_BOARDINFO is not set
 CONFIG_DISPLAY_BOARDINFO_LATE=y
 CONFIG_BOARD_EARLY_INIT_F=y

diff --git a/configs/apalis_imx6_nospl_it_defconfig b/configs/apalis_imx6_nospl_it_defconfig
index c89113cd5f074d54ce0569ae8d1319e5cc76663b..048d4f82710490cc583c1a42040d60404966a716 100644 (file)
--- a/configs/apalis_imx6_nospl_it_defconfig
+++ b/configs/apalis_imx6_nospl_it_defconfig
@@ -9,6 +9,7 @@ CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/toradex/apalis_imx6/apalis_imx6q.cfg,
 CONFIG_BOOTDELAY=1
 # CONFIG_CONSOLE_MUX is not set
 CONFIG_SUPPORT_RAW_INITRD=y
+CONFIG_VERSION_VARIABLE=y
 # CONFIG_DISPLAY_BOARDINFO is not set
 CONFIG_DISPLAY_BOARDINFO_LATE=y
 CONFIG_BOARD_EARLY_INIT_F=y

diff --git a/configs/colibri_imx6_defconfig b/configs/colibri_imx6_defconfig
index b9c9e11e5242d330353be3075e0e8f63dd1e9a6d..c19e782e412de646c2b6f8825a70fcc252d09ff7 100644 (file)
--- a/configs/colibri_imx6_defconfig
+++ b/configs/colibri_imx6_defconfig
@@ -14,6 +14,7 @@ CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/mach-imx/spl_sd.cfg,MX6DL"
 CONFIG_BOOTDELAY=1
 # CONFIG_CONSOLE_MUX is not set
 CONFIG_SUPPORT_RAW_INITRD=y
+CONFIG_VERSION_VARIABLE=y
 # CONFIG_DISPLAY_BOARDINFO is not set
 CONFIG_DISPLAY_BOARDINFO_LATE=y
 CONFIG_BOARD_EARLY_INIT_F=y

diff --git a/configs/colibri_imx6_nospl_defconfig b/configs/colibri_imx6_nospl_defconfig
index 84bd3913268df1bc6598f8fab3d1b33a0159889b..aecc17916159dc919735f7764fa9e5a4b25bf6f9 100644 (file)
--- a/configs/colibri_imx6_nospl_defconfig
+++ b/configs/colibri_imx6_nospl_defconfig
@@ -9,6 +9,7 @@ CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/toradex/colibri_imx6/colibri_imx6.cfg
 CONFIG_BOOTDELAY=1
 # CONFIG_CONSOLE_MUX is not set
 CONFIG_SUPPORT_RAW_INITRD=y
+CONFIG_VERSION_VARIABLE=y
 # CONFIG_DISPLAY_BOARDINFO is not set
 CONFIG_DISPLAY_BOARDINFO_LATE=y
 CONFIG_BOARD_EARLY_INIT_F=y

diff --git a/include/configs/apalis_imx6.h b/include/configs/apalis_imx6.h
index 122612a69c8060c5ed03a7056635e5e9c5a87175..eb8ffda67e1a18102678f9c5133c3a829179f172 100644 (file)
--- a/include/configs/apalis_imx6.h
+++ b/include/configs/apalis_imx6.h
@@ -38,9 +38,6 @@
 #define CONFIG_MXC_UART
 #define CONFIG_MXC_UART_BASE           UART1_BASE
 
-/* Make the HW version stuff available in U-Boot env */
-#define CONFIG_VERSION_VARIABLE                /* ver environment variable */
-
 /* I2C Configs */
 #define CONFIG_SYS_I2C
 #define CONFIG_SYS_I2C_MXC

diff --git a/include/configs/colibri_imx6.h b/include/configs/colibri_imx6.h
index 5c8f2d83af216ed7db654d53b4e75b52816c14f8..0c372c5e0093432e2fbf5a2c0249f86b2f451941 100644 (file)
--- a/include/configs/colibri_imx6.h
+++ b/include/configs/colibri_imx6.h
@@ -36,9 +36,6 @@
 #define CONFIG_MXC_UART
 #define CONFIG_MXC_UART_BASE           UART1_BASE
 
-/* Make the HW version stuff available in U-Boot env */
-#define CONFIG_VERSION_VARIABLE                /* ver environment variable */
-
 /* I2C Configs */
 #define CONFIG_SYS_I2C
 #define CONFIG_SYS_I2C_MXC