autoboot: Rename CONFIG_MENUKEY to CONFIG_AUTOBOOT_MENUKEY

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

diff --git a/cmd/Kconfig b/cmd/Kconfig
index 67284d8a5f6a2dc24cf86d0577814fdc4ba28272..8d2e0a9e4ec426430abaa537783f56af9e38b1c5 100644 (file)
--- a/cmd/Kconfig
+++ b/cmd/Kconfig
@@ -101,7 +101,14 @@ config AUTOBOOT_PROMPT
 config AUTOBOOT_ENCRYPTION
        bool "Enable encryption in autoboot stopping"
        depends on AUTOBOOT_KEYED
-       default n
+       help
+         This option allows a string to be entered into U-Boot to stop the
+         autoboot. The string itself is hashed and compared against the hash
+         in the environment variable 'bootstopkeysha256'. If it matches then
+         boot stops and a command-line prompt is presented.
+
+         This provides a way to ship a secure production device which can also
+         be accessed at the U-Boot command line.
 
 config AUTOBOOT_DELAY_STR
        string "Delay autobooting via specific input key / string"
@@ -146,6 +153,23 @@ config AUTOBOOT_STOP_STR_SHA256
          string / password matches a values that is encypted via
          a SHA256 hash and saved in the environment.
 
+config AUTOBOOT_USE_MENUKEY
+       bool "Allow a specify key to run a menu from the environment"
+       depends on !AUTOBOOT_KEYED
+       help
+         If a specific key is pressed to stop autoboot, then the commands in
+         the environment variable 'menucmd' are executed before boot starts.
+
+config AUTOBOOT_MENUKEY
+       int "ASCII value of boot key to show a menu"
+       default 0
+       depends on AUTOBOOT_USE_MENUKEY
+       help
+         If this key is pressed to stop autoboot, then the commands in the
+         environment variable 'menucmd' will be executed before boot starts.
+         For example, 33 means "!" in ASCII, so pressing ! at boot would take
+         this action.
+
 endmenu
 
 config BUILD_BIN2C
@@ -325,8 +349,8 @@ config CMD_SPL
          command.
 
 config CMD_SPL_NAND_OFS
-       hex "Offset of OS command line args for Falcon-mode NAND boot"
-       depends on CMD_SPL
+       hex "Offset of OS args or dtb for Falcon-mode NAND boot"
+       depends on CMD_SPL && (TPL_NAND_SUPPORT || SPL_NAND_SUPPORT)
        default 0
        help
          This provides the offset of the command line arguments for Linux
@@ -334,6 +358,14 @@ config CMD_SPL_NAND_OFS
          for full information about how to use this option (and also see
          board/gateworks/gw_ventana/README for an example).
 
+config CMD_SPL_NOR_OFS
+       hex "Offset of OS args or dtb for Falcon-mode NOR boot"
+       depends on CMD_SPL && SPL_NOR_SUPPORT
+       default 0
+       help
+         This provides the offset of the command line arguments or dtb for
+         Linux when booting from NOR in Falcon mode.
+
 config CMD_SPL_WRITE_SIZE
        hex "Size of argument area"
        depends on CMD_SPL
@@ -408,6 +440,14 @@ config CMD_SAVEENV
          Save all environment variables into the compiled-in persistent
          storage.
 
+config CMD_ERASEENV
+       bool "eraseenv"
+       default n
+       depends on CMD_SAVEENV
+       help
+         Erase environment variables from the compiled-in persistent
+         storage.
+
 config CMD_ENV_EXISTS
        bool "env exists"
        default y
@@ -563,6 +603,13 @@ config CMD_MEMORY
            base - print or set address offset
            loop - initialize loop on address range
 
+config CMD_RANDOM
+       bool "random"
+       default y
+       depends on CMD_MEMORY && (LIB_RAND || LIB_HW_RAND)
+       help
+         random - fill memory with random data
+
 config CMD_MEMTEST
        bool "memtest"
        help
@@ -720,7 +767,7 @@ config CMD_FASTBOOT
          Android devices. Fastboot requires either the network stack
          enabled or support for acting as a USB device.
 
-         See doc/README.android-fastboot for more information.
+         See doc/android/fastboot.txt for more information.
 
 config CMD_FDC
        bool "fdcboot - Boot from floppy device"
@@ -1183,6 +1230,21 @@ config CMD_SETEXPR
 
 endmenu
 
+menu "Android support commands"
+
+config CMD_AB_SELECT
+       bool "ab_select"
+       default n
+       depends on ANDROID_AB
+       help
+         On Android devices with more than one boot slot (multiple copies of
+         the kernel and system images) this provides a command to select which
+         slot should be used to boot from and register the boot attempt. This
+         is used by the new A/B update model where one slot is updated in the
+         background while running from the other slot.
+
+endmenu
+
 if NET
 
 menuconfig CMD_NET