Convert CONFIG_ENV_IS_IN_MMC/NAND/UBI and NOWHERE to Kconfig

[people/ms/u-boot.git] / common / Kconfig

diff --git a/common/Kconfig b/common/Kconfig
index 361346b092946e1ecb7f46768b73a692d07a2904..e06089b810b34753a686f346fbb32de87e805be8 100644 (file)
--- 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"