diff options
Diffstat (limited to 'common/Kconfig')
| -rw-r--r-- | common/Kconfig | 44 |
1 files changed, 22 insertions, 22 deletions
diff --git a/common/Kconfig b/common/Kconfig index f2badc7707..efd19494d6 100644 --- a/common/Kconfig +++ b/common/Kconfig @@ -342,7 +342,7 @@ config KALLSYMS This is useful to print a nice backtrace when an exception occurs. config RELOCATABLE - depends on PPC || ARM + depends on PPC || (ARM && !CPU_V8) bool "generate relocatable barebox binary" help A non relocatable barebox binary will run at it's compiled in @@ -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 @@ -936,6 +930,12 @@ config STATE_CRYPTO See Documentation/devicetree/bindings/barebox/barebox,state.rst for more information. +config BOOTCHOOSER + bool "bootchooser infrastructure" + select ENVIRONMENT_VARIABLES + select OFTREE + select PARAMETER + config RESET_SOURCE bool "detect Reset cause" depends on GLOBALVAR |