Merge branch 'master' of git://git.denx.de/u-boot-spi

[oweals/u-boot.git] / common / Kconfig

diff --git a/common/Kconfig b/common/Kconfig
index e100c2294961944fcfbaeb9d174b79fe9a2b6812..af66496e7521af6eb901d18e090d0f3cc62a7fb0 100644 (file)
--- a/common/Kconfig
+++ b/common/Kconfig
@@ -232,6 +232,25 @@ config BOOTCOMMAND
          This is the string of commands that will be used as bootcmd and if
          AUTOBOOT is set, automatically run.
 
+config USE_PREBOOT
+       bool "Enable preboot"
+       help
+         When this option is enabled, the existence of the environment
+         variable "preboot" will be checked immediately before starting the
+         CONFIG_BOOTDELAY countdown and/or running the auto-boot command resp.
+         entering interactive mode.
+
+         This feature is especially useful when "preboot" is automatically
+         generated or modified. For example, the boot code can modify the
+         "preboot" when a user holds down a certain combination of keys.
+
+config PREBOOT
+       string "preboot default value"
+       depends on USE_PREBOOT
+       default ""
+       help
+         This is the default of "preboot" environment variable.
+
 menu "Console"
 
 config MENU
@@ -541,7 +560,7 @@ config LOG_DEFAULT_LEVEL
        help
          This is the default logging level set when U-Boot starts. It can
          be adjusted later using the 'log level' command. Note that setting
-         this to a value abnove LOG_MAX_LEVEL will be ineffective, since the
+         this to a value above LOG_MAX_LEVEL will be ineffective, since the
          higher levels are not compiled in to U-Boot.
 
            0 - emergency