summaryrefslogtreecommitdiffstats
path: root/common/Kconfig
diff options
context:
space:
mode:
authorSascha Hauer <s.hauer@pengutronix.de>2016-09-27 08:09:42 +0200
committerSascha Hauer <s.hauer@pengutronix.de>2016-10-10 08:30:36 +0200
commit790980bf18af13f5d72a31b49febd7086cf307af (patch)
tree26e995e4c2e7a9cdf6a4858d3b19d947b369b75d /common/Kconfig
parent4d9734c8a26437838a5c1085fb3859734036e150 (diff)
downloadbarebox-790980bf18af13f5d72a31b49febd7086cf307af.tar.gz
Make generic default environment type a use choice
So far it was hardcoded for each board if defenv-1 or defenv-2 is used. Make this a user choice so that a particular board no longer enforces a defenv type. Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
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 38225eb..3b86c79 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
@@ -849,31 +846,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.
@@ -882,6 +864,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