| Message ID | 1522600674-31202-2-git-send-email-alex.kiernan@gmail.com |
|---|---|
| State | Accepted |
| Delegated to: | Tom Rini |
| Headers | show |
| Series | [U-Boot,v2,1/2] Migrate CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG to Kconfig | expand |
Hi Alex, > 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 <alex.kiernan@gmail.com> Reviewed-by: Petr Vorel <petr.vorel@gmail.com> > --- > Changes in v2: > - Remove default from Kconfig to avoid over-conversion by moveconfig Kind regards, Petr
On Sun, Apr 01, 2018 at 04:37:54PM +0000, Alex Kiernan wrote: > 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 <alex.kiernan@gmail.com> > Reviewed-by: Petr Vorel <petr.vorel@gmail.com> Applied to u-boot/master, thanks!
diff --git a/README b/README index a831585..f16a4f9 100644 --- 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 ff9b74b..18ae293 100644 --- 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_BOARD_EARLY_INIT_F=y CONFIG_SPL_DMA_SUPPORT=y diff --git a/configs/apalis_imx6_nospl_com_defconfig b/configs/apalis_imx6_nospl_com_defconfig index 63cc86d..5c7bb83 100644 --- 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_BOARD_EARLY_INIT_F=y CONFIG_HUSH_PARSER=y diff --git a/configs/apalis_imx6_nospl_it_defconfig b/configs/apalis_imx6_nospl_it_defconfig index 4d047c2..febb53d 100644 --- 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_BOARD_EARLY_INIT_F=y CONFIG_HUSH_PARSER=y diff --git a/configs/colibri_imx6_defconfig b/configs/colibri_imx6_defconfig index 49c5bff..a9a6c0a 100644 --- 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_BOARD_EARLY_INIT_F=y CONFIG_SPL_DMA_SUPPORT=y diff --git a/configs/colibri_imx6_nospl_defconfig b/configs/colibri_imx6_nospl_defconfig index b74543d..a7f1424 100644 --- 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_BOARD_EARLY_INIT_F=y CONFIG_HUSH_PARSER=y diff --git a/include/configs/apalis_imx6.h b/include/configs/apalis_imx6.h index 780e6cf..bd8a6ee 100644 --- a/include/configs/apalis_imx6.h +++ b/include/configs/apalis_imx6.h @@ -39,9 +39,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 42396e8..ba7708c 100644 --- a/include/configs/colibri_imx6.h +++ b/include/configs/colibri_imx6.h @@ -37,9 +37,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
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 <alex.kiernan@gmail.com> --- Changes in v2: - Remove default from Kconfig to avoid over-conversion by moveconfig README | 8 -------- configs/apalis_imx6_defconfig | 1 + configs/apalis_imx6_nospl_com_defconfig | 1 + configs/apalis_imx6_nospl_it_defconfig | 1 + configs/colibri_imx6_defconfig | 1 + configs/colibri_imx6_nospl_defconfig | 1 + include/configs/apalis_imx6.h | 3 --- include/configs/colibri_imx6.h | 3 --- 8 files changed, 5 insertions(+), 14 deletions(-)