summaryrefslogtreecommitdiffstats
path: root/common/Kconfig
diff options
context:
space:
mode:
authorSascha Hauer <s.hauer@pengutronix.de>2016-10-10 08:31:06 +0200
committerSascha Hauer <s.hauer@pengutronix.de>2016-10-10 08:31:06 +0200
commitdb9c78d57949cdd4c2c019eba9bd193c3171eb4d (patch)
tree79234eed17e54e07d38214b0186e05f775f220d9 /common/Kconfig
parentc80ba33cbe1eb2331a0544d0f553d73e091bb322 (diff)
parent790980bf18af13f5d72a31b49febd7086cf307af (diff)
downloadbarebox-db9c78d57949cdd4c2c019eba9bd193c3171eb4d.tar.gz
Merge branch 'for-next/defenv'
Diffstat (limited to 'common/Kconfig')
-rw-r--r--common/Kconfig36
1 files changed, 15 insertions, 21 deletions
diff --git a/common/Kconfig b/common/Kconfig
index 5974249..efd1949 100644
--- a/common/Kconfig
+++ b/common/Kconfig
@@ -826,11 +826,8 @@ config DEFAULT_COMPRESSION_NONE
endchoice
-config HAVE_DEFAULT_ENVIRONMENT_NEW
- bool
-
config DEFAULT_ENVIRONMENT_GENERIC_NEW
- bool
+ bool "Generic environment template"
depends on DEFAULT_ENVIRONMENT
depends on SHELL_HUSH
select BOOTM
@@ -850,31 +847,16 @@ config DEFAULT_ENVIRONMENT_GENERIC_NEW
select FLEXIBLE_BOOTARGS
select CMD_BOOT
select NET_CMD_IFUP if NET
- prompt "Generic environment template"
-
-config DEFAULT_ENVIRONMENT_GENERIC_NEW_MENU
- bool
- depends on DEFAULT_ENVIRONMENT_GENERIC_NEW
- depends on CMD_MENUTREE
- default y
-
-config DEFAULT_ENVIRONMENT_GENERIC_NEW_DFU
- bool
- depends on DEFAULT_ENVIRONMENT_GENERIC_NEW
- depends on USB_GADGET_DFU
- default y
config DEFAULT_ENVIRONMENT_GENERIC
- bool
- depends on !HAVE_DEFAULT_ENVIRONMENT_NEW
+ bool "Generic environment template (old version)"
depends on DEFAULT_ENVIRONMENT
+ depends on !DEFAULT_ENVIRONMENT_GENERIC_NEW
depends on SHELL_HUSH
select CMD_GETOPT
select CMD_CRC
select CMD_CRC_CMP
- select CMD_AUTOMOUNT if HAVE_DEFAULT_ENVIRONMENT_NEW
select CMD_GLOBAL
- prompt "Default environment generic"
help
With this option barebox will use the generic default
environment found under defaultenv/ in the src tree.
@@ -883,6 +865,18 @@ config DEFAULT_ENVIRONMENT_GENERIC
at least contain a /env/config file.
This will be able to overwrite the files from defaultenv.
+config DEFAULT_ENVIRONMENT_GENERIC_NEW_MENU
+ bool
+ depends on DEFAULT_ENVIRONMENT_GENERIC_NEW
+ depends on CMD_MENUTREE
+ default y
+
+config DEFAULT_ENVIRONMENT_GENERIC_NEW_DFU
+ bool
+ depends on DEFAULT_ENVIRONMENT_GENERIC_NEW
+ depends on USB_GADGET_DFU
+ default y
+
config DEFAULT_ENVIRONMENT_PATH
string
depends on DEFAULT_ENVIRONMENT