From: Lothar Waßmann <LW@KARO-electronics.de>
Date: Fri, 12 Jun 2015 08:52:29 +0000 (+0200)
Subject: kconfig: move 'Environment configuration settings' out of CMD menu
X-Git-Tag: KARO-TXA5-2015-06-26~30
X-Git-Url: https://git.kernelconcepts.de/?p=karo-tx-uboot.git;a=commitdiff_plain;h=71922b4636422eb086ba59b7b38f00525f7d0bac

kconfig: move 'Environment configuration settings' out of CMD menu

The menu 'Command line interface' is only available in non-SPL_BUILD.
Move the Environment configuration settings out of this menu context,
so they are available in SPL_BUILD too.
---

diff --git a/common/Kconfig b/common/Kconfig
index 97e5e4ef24..83cceaaef7 100644
--- a/common/Kconfig
+++ b/common/Kconfig
@@ -129,26 +129,6 @@ config CMD_SAVEENV
 
 endmenu
 
-menu "Environment configuration settings"
-
-choice
-	prompt "Select environment non-volatile storage"
-
-config ENV_IS_NOWHERE
-	bool "do not store environment"
-
-config ENV_IS_IN_NAND
-	bool "store environment in NAND"
-	depends on NAND
-
-config ENV_IS_IN_MMC
-	bool "store environment in MMC"
-	depends on MMC
-
-endchoice
-
-endmenu
-
 menu "Memory commands"
 
 config CMD_MEMORY
@@ -378,3 +358,26 @@ config CMD_SETGETDCR
 endmenu
 
 endmenu
+
+menu "Environment configuration settings"
+
+choice
+	prompt "Select environment non-volatile storage"
+
+config ENV_IS_NOWHERE
+	bool "do not store environment"
+
+config ENV_IS_IN_NAND
+	bool "store environment in NAND"
+	depends on NAND
+
+config ENV_IS_IN_MMC
+	bool "store environment in MMC"
+	depends on MMC
+
+config ENV_IS_IN_SPI_FLASH
+	bool "store environment in SPI flash"
+
+endchoice
+
+endmenu