[U-Boot] [PATCH 1/2] Migrate CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG to Kconfig
Lukasz Majewski
lukma at denx.de
Tue Mar 20 14:14:59 UTC 2018
On Tue, 20 Mar 2018 11:31:16 +0000
Alex Kiernan <alex.kiernan at gmail.com> wrote:
> Convert CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG to Kconfig
>
> Signed-off-by: Alex Kiernan <alex.kiernan at gmail.com>
> ---
>
> README | 6 ------
> configs/colibri_pxa270_defconfig | 1 +
> configs/s5p_goni_defconfig | 1 +
> env/Kconfig | 10 ++++++++++
> include/configs/am335x_evm.h | 2 --
> include/configs/am335x_igep003x.h | 2 --
> include/configs/am335x_shc.h | 2 --
> include/configs/am335x_sl50.h | 2 --
> include/configs/am43xx_evm.h | 2 --
> include/configs/apalis_imx6.h | 1 -
> include/configs/baltos.h | 2 --
> include/configs/bav335x.h | 2 --
> include/configs/cgtqmx6eval.h | 1 -
> include/configs/cl-som-am57x.h | 1 -
> include/configs/cm_fx6.h | 1 -
> include/configs/cm_t43.h | 1 -
> include/configs/colibri_imx6.h | 1 -
> include/configs/colibri_imx7.h | 2 --
> include/configs/colibri_pxa270.h | 1 -
> include/configs/colibri_vf.h | 1 -
> include/configs/duovero.h | 2 --
> include/configs/el6x_common.h | 1 -
> include/configs/imx6_logic.h | 2 --
> include/configs/k2g_evm.h | 2 --
> include/configs/mccmon6.h | 1 -
> include/configs/mx6cuboxi.h | 1 -
> include/configs/mx6sabre_common.h | 2 --
> include/configs/mx6sxsabresd.h | 1 -
> include/configs/mx6ul_14x14_evk.h | 2 --
> include/configs/mx6ullevk.h | 2 --
> include/configs/odroid.h | 1 -
> include/configs/odroid_xu3.h | 1 -
> include/configs/omap4_panda.h | 1 -
> include/configs/pcm051.h | 1 -
> include/configs/pengwyn.h | 2 --
> include/configs/pepper.h | 1 -
> include/configs/rpi.h | 1 -
> include/configs/s5p_goni.h | 1 -
> include/configs/s5pc210_universal.h | 2 --
> include/configs/sama5d3xek.h | 2 --
> include/configs/ti814x_evm.h | 1 -
> include/configs/ti_omap5_common.h | 1 -
> include/configs/trats.h | 2 --
> include/configs/trats2.h | 2 --
> include/configs/udoo.h | 2 --
> include/configs/udoo_neo.h | 1 -
> include/configs/vining_2000.h | 1 -
> include/configs/wandboard.h | 1 -
> include/configs/wb50n.h | 1 -
> scripts/config_whitelist.txt | 1 -
> 50 files changed, 12 insertions(+), 72 deletions(-)
>
> diff --git a/README b/README
> index 5fd6428..3d7b511 100644
> --- a/README
> +++ b/README
> @@ -2213,12 +2213,6 @@ The following options need to be configured:
> the environment like the "source" command or the
> boot command first.
>
> - CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG
> -
> - Define this in order to add variables describing
> certain
> - run-time determined information about the hardware
> to the
> - environment. These will be named board_name,
> board_rev. -
> CONFIG_DELAY_ENVIRONMENT
>
> Normally the environment is loaded when the board is
> diff --git a/configs/colibri_pxa270_defconfig
> b/configs/colibri_pxa270_defconfig index e21068e..958fbbbf 100644
> --- a/configs/colibri_pxa270_defconfig
> +++ b/configs/colibri_pxa270_defconfig
> @@ -22,6 +22,7 @@ CONFIG_CMD_PING=y
> CONFIG_CMD_EXT2=y
> CONFIG_CMD_FAT=y
> CONFIG_ENV_IS_IN_FLASH=y
> +CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y
> CONFIG_BOOTP_BOOTPATH=y
> CONFIG_BOOTP_GATEWAY=y
> CONFIG_BOOTP_HOSTNAME=y
> diff --git a/configs/s5p_goni_defconfig b/configs/s5p_goni_defconfig
> index 237b590..a54dd5f 100644
> --- a/configs/s5p_goni_defconfig
> +++ b/configs/s5p_goni_defconfig
> @@ -26,6 +26,7 @@ CONFIG_CMD_EXT4=y
> CONFIG_CMD_EXT4_WRITE=y
> CONFIG_CMD_FAT=y
> CONFIG_ENV_IS_IN_MMC=y
> +CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y
> # CONFIG_NET is not set
> CONFIG_DFU_MMC=y
> CONFIG_DM_I2C_GPIO=y
> diff --git a/env/Kconfig b/env/Kconfig
> index a3c6298..bf13cbf 100644
> --- a/env/Kconfig
> +++ b/env/Kconfig
> @@ -486,4 +486,14 @@ config ENV_SIZE
>
> endif
>
> +config ENV_VARS_UBOOT_RUNTIME_CONFIG
> + bool "Add run-time information to the environment"
> + default y if ARCH_OMAP2PLUS || ARCH_MX6 || ARCH_AT91 || \
> + ARCH_BCM283X || ARCH_KEYSTONE || ARCH_VF610 || \
> + ARCH_EXYNOS || ARCH_MX7
> + help
> + Enable this in order to add variables describing certain
> + run-time determined information about the hardware to the
> + environment. These will be named board_name, board_rev.
> +
> endmenu
> diff --git a/include/configs/am335x_evm.h
> b/include/configs/am335x_evm.h index 158b7d4..6e8477c 100644
> --- a/include/configs/am335x_evm.h
> +++ b/include/configs/am335x_evm.h
> @@ -56,8 +56,6 @@
> #define NANDARGS ""
> #endif
>
> -#define CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG
> -
> #define BOOTENV_DEV_LEGACY_MMC(devtypeu, devtypel, instance) \
> "bootcmd_" #devtypel #instance "=" \
> "setenv mmcdev " #instance"; "\
> diff --git a/include/configs/am335x_igep003x.h
> b/include/configs/am335x_igep003x.h index 50fd46a..42db594 100644
> --- a/include/configs/am335x_igep003x.h
> +++ b/include/configs/am335x_igep003x.h
> @@ -26,8 +26,6 @@
> #define CONFIG_UBI_SILENCE_MSG
> #define CONFIG_UBIFS_SILENCE_MSG
>
> -#define CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG
> -
> #ifndef CONFIG_SPL_BUILD
> #define CONFIG_EXTRA_ENV_SETTINGS \
> DEFAULT_LINUX_BOOT_ENV \
> diff --git a/include/configs/am335x_shc.h
> b/include/configs/am335x_shc.h index 6fa117e..017e9e5 100644
> --- a/include/configs/am335x_shc.h
> +++ b/include/configs/am335x_shc.h
> @@ -65,8 +65,6 @@
> # define CONFIG_RESET_TO_RETRY
> #endif
>
> -#define CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG
> -
> #ifndef CONFIG_SPL_BUILD
> #define CONFIG_EXTRA_ENV_SETTINGS \
> "loadaddr=0x80200000\0" \
> diff --git a/include/configs/am335x_sl50.h
> b/include/configs/am335x_sl50.h index 739a998..9687f37 100644
> --- a/include/configs/am335x_sl50.h
> +++ b/include/configs/am335x_sl50.h
> @@ -26,8 +26,6 @@
> /* Always 128 KiB env size */
> #define CONFIG_ENV_SIZE (128 << 10)
>
> -#define CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG
> -
> #ifndef CONFIG_SPL_BUILD
>
> #define MEM_LAYOUT_ENV_SETTINGS \
> diff --git a/include/configs/am43xx_evm.h
> b/include/configs/am43xx_evm.h index 663f861..8cd93e8 100644
> --- a/include/configs/am43xx_evm.h
> +++ b/include/configs/am43xx_evm.h
> @@ -62,8 +62,6 @@
> /* Always 64 KiB env size */
> #define CONFIG_ENV_SIZE (64 << 10)
>
> -#define CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG
> -
> /* Clock Defines */
> #define V_OSCK 24000000 /* Clock
> output from T2 */ #define V_SCLK
> (V_OSCK) diff --git a/include/configs/apalis_imx6.h
> b/include/configs/apalis_imx6.h index 9e5a7e5..780e6cf 100644
> --- a/include/configs/apalis_imx6.h
> +++ b/include/configs/apalis_imx6.h
> @@ -41,7 +41,6 @@
>
> /* Make the HW version stuff available in U-Boot env */
> #define CONFIG_VERSION_VARIABLE /* ver environment
> variable */ -#define CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG
>
> /* I2C Configs */
> #define CONFIG_SYS_I2C
> diff --git a/include/configs/baltos.h b/include/configs/baltos.h
> index 943a6f8..19db350 100644
> --- a/include/configs/baltos.h
> +++ b/include/configs/baltos.h
> @@ -69,8 +69,6 @@
> #define NANDARGS ""
> #endif
>
> -#define CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG
> -
> #ifndef CONFIG_SPL_BUILD
> #define CONFIG_EXTRA_ENV_SETTINGS \
> DEFAULT_LINUX_BOOT_ENV \
> diff --git a/include/configs/bav335x.h b/include/configs/bav335x.h
> index e7f65d6..a044329 100644
> --- a/include/configs/bav335x.h
> +++ b/include/configs/bav335x.h
> @@ -56,8 +56,6 @@
> #define NANDARGS ""
> #endif
>
> -#define CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG
> -
> #ifndef CONFIG_SPL_BUILD
> #define CONFIG_EXTRA_ENV_SETTINGS \
> DEFAULT_LINUX_BOOT_ENV \
> diff --git a/include/configs/cgtqmx6eval.h
> b/include/configs/cgtqmx6eval.h index afc0bae..b3814a6 100644
> --- a/include/configs/cgtqmx6eval.h
> +++ b/include/configs/cgtqmx6eval.h
> @@ -99,7 +99,6 @@
> #define CONFIG_MMCROOT "/dev/mmcblk0p2"
> #define CONFIG_SYS_MMC_ENV_DEV 0
>
> -#define CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG
> #define CONFIG_EXTRA_ENV_SETTINGS \
> "script=boot.scr\0" \
> "image=zImage\0" \
> diff --git a/include/configs/cl-som-am57x.h
> b/include/configs/cl-som-am57x.h index 596e060..51686cd 100644
> --- a/include/configs/cl-som-am57x.h
> +++ b/include/configs/cl-som-am57x.h
> @@ -45,7 +45,6 @@
>
> /* Environment */
> #define CONFIG_ENV_SIZE (16 << 10) /* 16 KiB
> env size */ -#define CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG
>
> #define CONFIG_ENV_SECT_SIZE (64 * 1024)
> #define CONFIG_ENV_OFFSET (768 * 1024)
> diff --git a/include/configs/cm_fx6.h b/include/configs/cm_fx6.h
> index 4f36930..9cf559e 100644
> --- a/include/configs/cm_fx6.h
> +++ b/include/configs/cm_fx6.h
> @@ -63,7 +63,6 @@
> #define CONFIG_ENV_OFFSET (768 * 1024)
>
> #ifndef CONFIG_SPL_BUILD
> -#define CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG
> #define CONFIG_EXTRA_ENV_SETTINGS \
> "fdt_high=0xffffffff\0" \
> "initrd_high=0xffffffff\0" \
> diff --git a/include/configs/cm_t43.h b/include/configs/cm_t43.h
> index da78519..a1dd599 100644
> --- a/include/configs/cm_t43.h
> +++ b/include/configs/cm_t43.h
> @@ -84,7 +84,6 @@
> #undef CONFIG_SYS_MONITOR_LEN
>
> #define CONFIG_ENV_SIZE (16 * 1024)
> -#define CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG
>
> #define V_OSCK 24000000 /* Clock
> output from T2 */ #define V_SCLK
> (V_OSCK) diff --git a/include/configs/colibri_imx6.h
> b/include/configs/colibri_imx6.h index 72db44d..42396e8 100644
> --- a/include/configs/colibri_imx6.h
> +++ b/include/configs/colibri_imx6.h
> @@ -39,7 +39,6 @@
>
> /* Make the HW version stuff available in U-Boot env */
> #define CONFIG_VERSION_VARIABLE /* ver environment
> variable */ -#define CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG
>
> /* I2C Configs */
> #define CONFIG_SYS_I2C
> diff --git a/include/configs/colibri_imx7.h
> b/include/configs/colibri_imx7.h index 27f44ac..1a742a6 100644
> --- a/include/configs/colibri_imx7.h
> +++ b/include/configs/colibri_imx7.h
> @@ -19,8 +19,6 @@
>
> #define CONFIG_DISPLAY_BOARDINFO_LATE /* Calls
> show_board_info() */
> -#define CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG
> -
> /* Size of malloc() pool */
> #define CONFIG_SYS_MALLOC_LEN (32 * SZ_1M)
>
> diff --git a/include/configs/colibri_pxa270.h
> b/include/configs/colibri_pxa270.h index 484483d..6a77c39 100644
> --- a/include/configs/colibri_pxa270.h
> +++ b/include/configs/colibri_pxa270.h
> @@ -26,7 +26,6 @@
> * Environment settings
> */
> #define CONFIG_ENV_OVERWRITE
> -#define CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG
> #define CONFIG_SYS_MALLOC_LEN (128 * 1024)
> #define CONFIG_ARCH_CPU_INIT
> #define
> CONFIG_BOOTCOMMAND \
> diff --git a/include/configs/colibri_vf.h
> b/include/configs/colibri_vf.h index 1078480..782e007 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
>
> /* NAND support */
> #define CONFIG_SYS_NAND_ONFI_DETECTION
> diff --git a/include/configs/duovero.h b/include/configs/duovero.h
> index 96644b1..1fecac2 100644
> --- a/include/configs/duovero.h
> +++ b/include/configs/duovero.h
> @@ -34,6 +34,4 @@
>
> /* ENV related config options */
>
> -#define CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG
> -
> #endif /* __CONFIG_DUOVERO_H */
> diff --git a/include/configs/el6x_common.h
> b/include/configs/el6x_common.h index 94e0bdf..53902d1 100644
> --- a/include/configs/el6x_common.h
> +++ b/include/configs/el6x_common.h
> @@ -56,7 +56,6 @@
>
> #define CONFIG_BOARD_NAME EL6Q
>
> -#define CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG
> #define
> CONFIG_EXTRA_ENV_SETTINGS
> \
> "board="__stringify(CONFIG_BOARD_NAME)"\0"
> \
> "cma_size="__stringify(EL6Q_CMA_SIZE)"\0"
> \ diff --git a/include/configs/imx6_logic.h
> b/include/configs/imx6_logic.h index 1bc7f2a..bfc9b33 100644 ---
> a/include/configs/imx6_logic.h +++ b/include/configs/imx6_logic.h @@
> -28,8 +28,6 @@ #define CONFIG_ETHPRIME "FEC" #define
> CONFIG_FEC_MXC_PHYADDR 0
> -#define CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG
> -
> #define CONFIG_EXTRA_ENV_SETTINGS \
> "script=boot.scr\0" \
> "image=zImage\0" \
> diff --git a/include/configs/k2g_evm.h b/include/configs/k2g_evm.h
> index f00ca1c..b14f6c5 100644
> --- a/include/configs/k2g_evm.h
> +++ b/include/configs/k2g_evm.h
> @@ -16,8 +16,6 @@
> /* Platform type */
> #define CONFIG_SOC_K2G
>
> -#define CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG
> -
> /* U-Boot general configuration */
> #define
> CONFIG_EXTRA_ENV_KS2_BOARD_SETTINGS \
> DEFAULT_MMC_TI_ARGS \
> diff --git a/include/configs/mccmon6.h b/include/configs/mccmon6.h
> index 8eb248a..0aa797a 100644 --- a/include/configs/mccmon6.h
> +++ b/include/configs/mccmon6.h
> @@ -94,7 +94,6 @@
> #define CONFIG_ETHPRIME "FEC"
> #define CONFIG_FEC_MXC_PHYADDR 1
>
> -#define CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG
> #define CONFIG_EXTRA_ENV_SETTINGS \
> "console=ttymxc0,115200 quiet\0" \
> "fdtfile=imx6q-mccmon6.dtb\0" \
> diff --git a/include/configs/mx6cuboxi.h b/include/configs/mx6cuboxi.h
> index 0e1d18c..9fbd162 100644
> --- a/include/configs/mx6cuboxi.h
> +++ b/include/configs/mx6cuboxi.h
> @@ -71,7 +71,6 @@
> #define CONFIG_SYS_FSL_USDHC_NUM 1
> #define CONFIG_SYS_MMC_ENV_DEV 0 /* SDHC2 */
>
> -#define CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG
> #ifndef CONFIG_SPL_BUILD
> #define CONFIG_EXTRA_ENV_SETTINGS \
> "fdtfile=undefined\0" \
> diff --git a/include/configs/mx6sabre_common.h
> b/include/configs/mx6sabre_common.h index d976e77..6f970a4 100644
> --- a/include/configs/mx6sabre_common.h
> +++ b/include/configs/mx6sabre_common.h
> @@ -57,8 +57,6 @@
> #define EMMC_ENV ""
> #endif
>
> -#define CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG
> -
> #define CONFIG_EXTRA_ENV_SETTINGS \
> "script=boot.scr\0" \
> "image=zImage\0" \
> diff --git a/include/configs/mx6sxsabresd.h
> b/include/configs/mx6sxsabresd.h index 1eaaf01..713ebf6 100644
> --- a/include/configs/mx6sxsabresd.h
> +++ b/include/configs/mx6sxsabresd.h
> @@ -43,7 +43,6 @@
> #define UPDATE_M4_ENV ""
> #endif
>
> -#define CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG
> #define CONFIG_EXTRA_ENV_SETTINGS \
> UPDATE_M4_ENV \
> "script=boot.scr\0" \
> diff --git a/include/configs/mx6ul_14x14_evk.h
> b/include/configs/mx6ul_14x14_evk.h index 1c1671e..733538f 100644
> --- a/include/configs/mx6ul_14x14_evk.h
> +++ b/include/configs/mx6ul_14x14_evk.h
> @@ -18,8 +18,6 @@
> /* SPL options */
> #include "imx6_spl.h"
>
> -#define CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG
> -
> /* Size of malloc() pool */
> #define CONFIG_SYS_MALLOC_LEN (16 * SZ_1M)
>
> diff --git a/include/configs/mx6ullevk.h b/include/configs/mx6ullevk.h
> index 2142913..cf9f8ab 100644
> --- a/include/configs/mx6ullevk.h
> +++ b/include/configs/mx6ullevk.h
> @@ -22,8 +22,6 @@
>
> #define PHYS_SDRAM_SIZE SZ_512M
>
> -#define CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG
> -
> /* Size of malloc() pool */
> #define CONFIG_SYS_MALLOC_LEN (16 * SZ_1M)
>
> diff --git a/include/configs/odroid.h b/include/configs/odroid.h
> index 2c8ee7a..8faa7a3 100644
> --- a/include/configs/odroid.h
> +++ b/include/configs/odroid.h
> @@ -185,7 +185,6 @@
> * TODO: Add Odroid X support
> */
> #define CONFIG_MISC_COMMON
> -#define CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG
> #define CONFIG_BOARD_TYPES
> #define CONFIG_MISC_INIT_R
>
> diff --git a/include/configs/odroid_xu3.h
> b/include/configs/odroid_xu3.h index 9067ba6..53edd23 100644
> --- a/include/configs/odroid_xu3.h
> +++ b/include/configs/odroid_xu3.h
> @@ -88,7 +88,6 @@
> #define CONFIG_SET_DFU_ALT_BUF_LEN (SZ_1K)
>
> /* Set soc_rev, soc_id, board_rev, boardname, fdtfile */
> -#define CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG
> #define CONFIG_ODROID_REV_AIN 9
> #define CONFIG_REVISION_TAG
> #define CONFIG_BOARD_TYPES
> diff --git a/include/configs/omap4_panda.h
> b/include/configs/omap4_panda.h index 75203b2..8cded99 100644
> --- a/include/configs/omap4_panda.h
> +++ b/include/configs/omap4_panda.h
> @@ -30,7 +30,6 @@
>
> /* ENV related config options */
>
> -#define CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG
> #define CONFIG_ENV_OVERWRITE
>
> #endif /* __CONFIG_PANDA_H */
> diff --git a/include/configs/pcm051.h b/include/configs/pcm051.h
> index 411403e..4f72350 100644
> --- a/include/configs/pcm051.h
> +++ b/include/configs/pcm051.h
> @@ -25,7 +25,6 @@
> #define CONFIG_MACH_TYPE MACH_TYPE_PCM051
>
> /* set to negative value for no autoboot */
> -#define CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG
> #define CONFIG_EXTRA_ENV_SETTINGS \
> "loadaddr=0x80007fc0\0" \
> "fdtaddr=0x80000000\0" \
> diff --git a/include/configs/pengwyn.h b/include/configs/pengwyn.h
> index 74bfde7..545f859 100644
> --- a/include/configs/pengwyn.h
> +++ b/include/configs/pengwyn.h
> @@ -22,8 +22,6 @@
> /* set env size */
> #define CONFIG_ENV_SIZE 0x4000
>
> -#define CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG
> -
> #ifndef CONFIG_SPL_BUILD
> #define CONFIG_EXTRA_ENV_SETTINGS \
> "loadaddr=0x80200000\0" \
> diff --git a/include/configs/pepper.h b/include/configs/pepper.h
> index f0ffc51..44dcfba 100644
> --- a/include/configs/pepper.h
> +++ b/include/configs/pepper.h
> @@ -20,7 +20,6 @@
>
> #define CONFIG_ENV_SIZE (128 << 10) /*
> 128 KiB */
> -#define CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG
> #define CONFIG_EXTRA_ENV_SETTINGS \
> DEFAULT_LINUX_BOOT_ENV \
> "bootdir=/boot\0" \
> diff --git a/include/configs/rpi.h b/include/configs/rpi.h
> index 17cdecd..325e52a 100644
> --- a/include/configs/rpi.h
> +++ b/include/configs/rpi.h
> @@ -86,7 +86,6 @@
> #define CONFIG_INITRD_TAG
>
> /* Environment */
> -#define CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG
> #define ENV_DEVICE_SETTINGS \
> "stdin=serial,usbkbd\0" \
> "stdout=serial,vidconsole\0" \
> diff --git a/include/configs/s5p_goni.h b/include/configs/s5p_goni.h
> index 1b40c29..40f037e 100644
> --- a/include/configs/s5p_goni.h
> +++ b/include/configs/s5p_goni.h
> @@ -103,7 +103,6 @@
> #define CONFIG_MISC_INIT_R
>
> #define CONFIG_ENV_OVERWRITE
> -#define CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG
> #define
> CONFIG_EXTRA_ENV_SETTINGS \
> CONFIG_UPDATEB \ "updatek=" \
> diff --git a/include/configs/s5pc210_universal.h
> b/include/configs/s5pc210_universal.h index 841dedd..410d20b 100644
> --- a/include/configs/s5pc210_universal.h
> +++ b/include/configs/s5pc210_universal.h
> @@ -71,8 +71,6 @@
>
> #define CONFIG_ENV_COMMON_BOOT "${console} ${meminfo}"
>
> -#define CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG
> -
> #define
> CONFIG_EXTRA_ENV_SETTINGS \
> "updateb=" \ "onenand erase 0x0 0x100000;" \
> diff --git a/include/configs/sama5d3xek.h
> b/include/configs/sama5d3xek.h index 843aaa6..be19d8d 100644
> --- a/include/configs/sama5d3xek.h
> +++ b/include/configs/sama5d3xek.h
> @@ -15,8 +15,6 @@
>
> #include "at91-sama5_common.h"
>
> -#define CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG
> -
> /*
> * This needs to be defined for the OHCI code to work but it is
> defined as
> * ATMEL_ID_UHPHS in the CPU specific header files.
> diff --git a/include/configs/ti814x_evm.h
> b/include/configs/ti814x_evm.h index 2f9056c..a951118 100644
> --- a/include/configs/ti814x_evm.h
> +++ b/include/configs/ti814x_evm.h
> @@ -28,7 +28,6 @@
>
> /* commands to include */
>
> -#define CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG
> #define CONFIG_EXTRA_ENV_SETTINGS \
> "loadaddr=0x80200000\0" \
> "fdtaddr=0x80F80000\0" \
> diff --git a/include/configs/ti_omap5_common.h
> b/include/configs/ti_omap5_common.h index 5391641..d6ea17b 100644
> --- a/include/configs/ti_omap5_common.h
> +++ b/include/configs/ti_omap5_common.h
> @@ -58,7 +58,6 @@
> #include <environment/ti/boot.h>
> #include <environment/ti/mmc.h>
>
> -#define CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG
> #define CONFIG_EXTRA_ENV_SETTINGS \
> DEFAULT_LINUX_BOOT_ENV \
> DEFAULT_MMC_TI_ARGS \
> diff --git a/include/configs/trats.h b/include/configs/trats.h
> index e6649ff..e892b59 100644
> --- a/include/configs/trats.h
> +++ b/include/configs/trats.h
> @@ -57,8 +57,6 @@
>
> #define CONFIG_ENV_OVERWRITE
>
> -#define CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG
> -
> /* Tizen - partitions definitions */
> #define PARTS_CSA "csa-mmc"
> #define PARTS_BOOT "boot"
> diff --git a/include/configs/trats2.h b/include/configs/trats2.h
> index c3eb7c9..aecac07 100644
> --- a/include/configs/trats2.h
> +++ b/include/configs/trats2.h
> @@ -52,8 +52,6 @@
>
> #define CONFIG_ENV_OVERWRITE
>
> -#define CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG
> -
> /* Tizen - partitions definitions */
> #define PARTS_CSA "csa-mmc"
> #define PARTS_BOOT "boot"
> diff --git a/include/configs/udoo.h b/include/configs/udoo.h
> index 989014a..dd86dee 100644
> --- a/include/configs/udoo.h
> +++ b/include/configs/udoo.h
> @@ -46,8 +46,6 @@
> /* MMC Configuration */
> #define CONFIG_SYS_FSL_ESDHC_ADDR 0
>
> -#define CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG
> -
> #define CONFIG_EXTRA_ENV_SETTINGS \
> "script=boot.scr\0" \
> "image=zImage\0" \
> diff --git a/include/configs/udoo_neo.h b/include/configs/udoo_neo.h
> index 35a6eca..7e6b980 100644
> --- a/include/configs/udoo_neo.h
> +++ b/include/configs/udoo_neo.h
> @@ -27,7 +27,6 @@
> #define CONFIG_SYS_MMC_ENV_DEV 0 /*USDHC2*/
>
> /* Linux only */
> -#define CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG
> #define CONFIG_EXTRA_ENV_SETTINGS \
> "console=ttymxc0,115200\0" \
> "fdt_high=0xffffffff\0" \
> diff --git a/include/configs/vining_2000.h
> b/include/configs/vining_2000.h index f054c99..45d1c35 100644
> --- a/include/configs/vining_2000.h
> +++ b/include/configs/vining_2000.h
> @@ -92,7 +92,6 @@
> #define CONFIG_PWM_IMX
> #define CONFIG_IMX6_PWM_PER_CLK 66000000
>
> -#define CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG
> #define CONFIG_ENV_OFFSET (8 * SZ_64K)
> #define CONFIG_ENV_SIZE SZ_8K
> #define CONFIG_ENV_OFFSET_REDUND (9 * SZ_64K)
> diff --git a/include/configs/wandboard.h b/include/configs/wandboard.h
> index 487cb1f..fb392f8 100644
> --- a/include/configs/wandboard.h
> +++ b/include/configs/wandboard.h
> @@ -79,7 +79,6 @@
> #define CONFIG_IMX_VIDEO_SKIP
> #endif
>
> -#define CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG
> #define CONFIG_EXTRA_ENV_SETTINGS \
> "console=ttymxc0,115200\0" \
> "splashpos=m,m\0" \
> diff --git a/include/configs/wb50n.h b/include/configs/wb50n.h
> index c61865f..76a02bc 100644
> --- a/include/configs/wb50n.h
> +++ b/include/configs/wb50n.h
> @@ -23,7 +23,6 @@
> #define CONFIG_SKIP_LOWLEVEL_INIT
> #endif
>
> -#define CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG
> #define CONFIG_IMAGE_FORMAT_LEGACY
>
> /* general purpose I/O */
> diff --git a/scripts/config_whitelist.txt
> b/scripts/config_whitelist.txt index d6fd150..38996ea 100644
> --- a/scripts/config_whitelist.txt
> +++ b/scripts/config_whitelist.txt
> @@ -538,7 +538,6 @@ CONFIG_ENV_TOTAL_SIZE
> CONFIG_ENV_UBIFS_OPTION
> CONFIG_ENV_UBI_MTD
> CONFIG_ENV_UBI_VOLUME_REDUND
> -CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG
> CONFIG_ENV_VERSION
> CONFIG_EP9302
> CONFIG_EP9307
Reviewed-by: Lukasz Majewski <lukma at denx.de>
Best regards,
Lukasz Majewski
--
DENX Software Engineering GmbH, Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd at denx.de
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 488 bytes
Desc: OpenPGP digital signature
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20180320/67220cac/attachment.sig>
More information about the U-Boot
mailing list