diff options
| author | Simon Glass <sjg@chromium.org> | 2017-07-24 03:19:39 (GMT) |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2017-07-26 01:08:01 (GMT) |
| commit | 2be296538e2e9d2893dc495b3fc8f9f6acb1454c (patch) | |
| tree | 8e0c795c20efffb8c3e3a0cedf62a3e3d5658c2c /common/Kconfig | |
| parent | 5785e51940f0dd89ab372a56fc7341fdd2739277 (diff) | |
| download | u-boot-fsl-qoriq-2be296538e2e9d2893dc495b3fc8f9f6acb1454c.tar.xz | |
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>
Diffstat (limited to 'common/Kconfig')
| -rw-r--r-- | common/Kconfig | 16 |
1 files changed, 5 insertions, 11 deletions
diff --git a/common/Kconfig b/common/Kconfig index 361346b..e06089b 100644 --- a/common/Kconfig +++ b/common/Kconfig @@ -176,30 +176,24 @@ endmenu menu "Environment" -if ARCH_SUNXI - -choice - prompt "Environment Device" - default ENV_IS_IN_MMC if ARCH_SUNXI - config ENV_IS_IN_MMC bool "Environment in an MMC device" - depends on CMD_MMC + depends on !CHAIN_OF_TRUST + default y if ARCH_SUNXI help Define this if you have an MMC device which you want to use for the environment. config ENV_IS_IN_NAND bool "Environment in a NAND device" - depends on CMD_NAND + depends on !CHAIN_OF_TRUST help Define this if you have a NAND device which you want to use for the environment. config ENV_IS_IN_UBI bool "Environment in a UBI volume" - depends on CMD_UBI - depends on CMD_MTDPARTS + depends on !CHAIN_OF_TRUST help Define this if you have a UBI volume which you want to use for the environment. @@ -210,7 +204,7 @@ config ENV_IS_NOWHERE Define this if you don't want to or can't have an environment stored on a storage medium -endchoice +if ARCH_SUNXI config ENV_OFFSET hex "Environment Offset" |