Convert CONFIG_ENV_IS_IN_MMC/NAND/UBI and NOWHERE to Kconfig
This converts the following to Kconfig: CONFIG_ENV_IS_IN_MMC CONFIG_ENV_IS_IN_NAND CONFIG_ENV_IS_IN_UBI CONFIG_ENV_IS_NOWHERE In fact this already exists for sunxi as a 'choice' config. However not all the choices are available in Kconfig yet so we cannot use that. It would lead to more than one option being set. In addition, one purpose of this series is to allow the environment to be stored in more than one place. So the existing choice is converted to a normal config allowing each option to be set independently. There are not many opportunities for Kconfig updates to reduce the size of this patch. This was tested with ./tools/moveconfig.py -i CONFIG_ENV_IS_IN_MMC And then manual updates. This is because for CHAIN_OF_TRUST boards they can only have ENV_IS_NOWHERE set, so we enforce that via Kconfig logic now. Signed-off-by: Simon Glass <sjg@chromium.org> Signed-off-by: Tom Rini <trini@konsulko.com>
This commit is contained in:
@@ -1022,6 +1022,7 @@ config ARCH_UNIPHIER
|
||||
select SPL_PINCTRL if SPL
|
||||
select SUPPORT_SPL
|
||||
imply FAT_WRITE
|
||||
imply ENV_IS_IN_MMC
|
||||
help
|
||||
Support for UniPhier SoC family developed by Socionext Inc.
|
||||
(formerly, System LSI Business Division of Panasonic Corporation)
|
||||
|
@@ -8,6 +8,7 @@ config ARCH_EXYNOS4
|
||||
bool "Exynos4 SoC family"
|
||||
select CPU_V7
|
||||
select BOARD_EARLY_INIT_F
|
||||
imply ENV_IS_IN_MMC
|
||||
help
|
||||
Samsung Exynos4 SoC family are based on ARM Cortex-A9 CPU. There
|
||||
are multiple SoCs in this family including Exynos4210, Exynos4412,
|
||||
|
@@ -30,6 +30,7 @@ config MX6SL
|
||||
config MX6SX
|
||||
select ROM_UNIFIED_SECTIONS
|
||||
bool
|
||||
imply ENV_IS_IN_MMC
|
||||
|
||||
config MX6SLL
|
||||
select ROM_UNIFIED_SECTIONS
|
||||
|
@@ -13,6 +13,7 @@ config MX7D
|
||||
select ROM_UNIFIED_SECTIONS
|
||||
imply CMD_FUSE
|
||||
bool
|
||||
imply ENV_IS_IN_MMC
|
||||
|
||||
choice
|
||||
prompt "MX7 board select"
|
||||
|
@@ -59,6 +59,7 @@ config MACH_SUNXI_H3_H5
|
||||
select SUNXI_DRAM_DW_32BIT
|
||||
select SUNXI_GEN_SUN6I
|
||||
select SUPPORT_SPL
|
||||
imply ENV_IS_IN_MMC
|
||||
|
||||
choice
|
||||
prompt "Sunxi SoC Variant"
|
||||
@@ -70,6 +71,7 @@ config MACH_SUN4I
|
||||
select ARM_CORTEX_CPU_IS_UP
|
||||
select SUNXI_GEN_SUN4I
|
||||
select SUPPORT_SPL
|
||||
imply ENV_IS_IN_MMC
|
||||
|
||||
config MACH_SUN5I
|
||||
bool "sun5i (Allwinner A13)"
|
||||
@@ -87,6 +89,7 @@ config MACH_SUN6I
|
||||
select SUNXI_GEN_SUN6I
|
||||
select SUPPORT_SPL
|
||||
select ARMV7_BOOT_SEC_DEFAULT if OLD_SUNXI_KERNEL_COMPAT
|
||||
imply ENV_IS_IN_MMC
|
||||
|
||||
config MACH_SUN7I
|
||||
bool "sun7i (Allwinner A20)"
|
||||
@@ -97,6 +100,7 @@ config MACH_SUN7I
|
||||
select SUNXI_GEN_SUN4I
|
||||
select SUPPORT_SPL
|
||||
select ARMV7_BOOT_SEC_DEFAULT if OLD_SUNXI_KERNEL_COMPAT
|
||||
imply ENV_IS_IN_MMC
|
||||
|
||||
config MACH_SUN8I_A23
|
||||
bool "sun8i (Allwinner A23)"
|
||||
@@ -107,6 +111,7 @@ config MACH_SUN8I_A23
|
||||
select SUNXI_GEN_SUN6I
|
||||
select SUPPORT_SPL
|
||||
select ARMV7_BOOT_SEC_DEFAULT if OLD_SUNXI_KERNEL_COMPAT
|
||||
imply ENV_IS_IN_MMC
|
||||
|
||||
config MACH_SUN8I_A33
|
||||
bool "sun8i (Allwinner A33)"
|
||||
@@ -132,6 +137,7 @@ config MACH_SUN8I_H3
|
||||
select ARCH_SUPPORT_PSCI
|
||||
select MACH_SUNXI_H3_H5
|
||||
select ARMV7_BOOT_SEC_DEFAULT if OLD_SUNXI_KERNEL_COMPAT
|
||||
imply ENV_IS_IN_MMC
|
||||
|
||||
config MACH_SUN8I_R40
|
||||
bool "sun8i (Allwinner R40)"
|
||||
|
@@ -60,6 +60,7 @@ config TEGRA_ARMV8_COMMON
|
||||
bool "Tegra 64-bit common options"
|
||||
select ARM64
|
||||
select TEGRA_COMMON
|
||||
imply ENV_IS_IN_MMC
|
||||
|
||||
choice
|
||||
prompt "Tegra SoC select"
|
||||
@@ -77,6 +78,7 @@ config TEGRA30
|
||||
select ARM_ERRATA_743622
|
||||
select ARM_ERRATA_751472
|
||||
select TEGRA_ARMV7_COMMON
|
||||
imply ENV_IS_IN_MMC
|
||||
|
||||
config TEGRA114
|
||||
bool "Tegra114 family"
|
||||
@@ -85,6 +87,7 @@ config TEGRA114
|
||||
config TEGRA124
|
||||
bool "Tegra124 family"
|
||||
select TEGRA_ARMV7_COMMON
|
||||
imply ENV_IS_IN_MMC
|
||||
|
||||
config TEGRA210
|
||||
bool "Tegra210 family"
|
||||
|
@@ -83,6 +83,7 @@ config ARCH_BMIPS
|
||||
select CPU
|
||||
select RAM
|
||||
select SYSRESET
|
||||
imply ENV_IS_NOWHERE
|
||||
|
||||
config MACH_PIC32
|
||||
bool "Support Microchip PIC32"
|
||||
|
Reference in New Issue
Block a user