summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--commands/Kconfig5
-rw-r--r--common/Kconfig12
2 files changed, 11 insertions, 6 deletions
diff --git a/commands/Kconfig b/commands/Kconfig
index 875c5f4f01..39a2df535f 100644
--- a/commands/Kconfig
+++ b/commands/Kconfig
@@ -348,7 +348,7 @@ config CMD_BOOTM
select UIMAGE
select UNCOMPRESS
select FILETYPE
- select GLOBALVAR
+ depends on GLOBALVAR
prompt "bootm"
help
Boot an application image
@@ -741,13 +741,12 @@ config CMD_EXPORT
config CMD_DEFAULTENV
tristate
- select ENV_HANDLING
prompt "defaultenv"
help
restore environment from default environment
config CMD_GLOBAL
- select GLOBALVAR
+ depends on GLOBALVAR
tristate
prompt "global"
help
diff --git a/common/Kconfig b/common/Kconfig
index 309d264f4a..949c9960b5 100644
--- a/common/Kconfig
+++ b/common/Kconfig
@@ -78,9 +78,6 @@ config FITIMAGE_SIGNATURE
config LOGBUF
bool
-config GLOBALVAR
- bool
-
config STDDEV
bool
@@ -159,6 +156,15 @@ config MEMINFO
config ENVIRONMENT_VARIABLES
bool "environment variables support"
+config GLOBALVAR
+ bool "global environment variables support"
+ default y if !SHELL_NONE
+ help
+ Global environment variables begin with "global.". Unlike normal
+ shell variables they have the same values in all contexts. Global
+ variables are used to control several aspects of the system behaviour.
+ If unsure, say yes here.
+
menu "memory layout"
source "pbl/Kconfig"