Merge branch 'tx6-bugfix'

[karo-tx-uboot.git] / common / Kconfig

diff --git a/common/Kconfig b/common/Kconfig
index 147fb45db8018f3e864ee1d9f52e60eaacd09d47..e70bafb8a291260f2dbd726b8092ec020af803eb 100644 (file)
--- a/common/Kconfig
+++ b/common/Kconfig
@@ -28,7 +28,6 @@ menu "Autoboot options"
 
 config AUTOBOOT_KEYED
        bool "Stop autobooting via specific input key / string"
-       default n
        help
          This option enables stopping (aborting) of the automatic
          boot feature only by issuing a specific input key or
@@ -55,7 +54,6 @@ config AUTOBOOT_PROMPT
 config AUTOBOOT_ENCRYPTION
        bool "Enable encryption in autoboot stopping"
        depends on AUTOBOOT_KEYED
-       default n
 
 config AUTOBOOT_DELAY_STR
        string "Delay autobooting via specific input key / string"
@@ -84,7 +82,6 @@ config AUTOBOOT_STOP_STR
 config AUTOBOOT_KEYED_CTRLC
        bool "Enable Ctrl-C autoboot interruption"
        depends on AUTOBOOT_KEYED && !AUTOBOOT_ENCRYPTION
-       default n
        help
          This option allows for the boot sequence to be interrupted
          by ctrl-c, in addition to the "bootdelaykey" and "bootstopkey".
@@ -236,6 +233,12 @@ config CMD_ENV_EXISTS
          Check if a variable is defined in the environment for use in
          shell scripting.
 
+config UBOOT_IGNORE_ENV
+       bool
+       help
+         Ignore non-volatile environment settings and use default
+         environment only.
+
 endmenu
 
 menu "Memory commands"