doc: fix mistyped "env flags" command

[pandora-u-boot.git] / boot / Kconfig

diff --git a/boot/Kconfig b/boot/Kconfig
index 9f5b8a0..3d7aabd 100644 (file)
--- a/boot/Kconfig
+++ b/boot/Kconfig
@@ -20,6 +20,21 @@ config TIMESTAMP
          loaded that does not, the message 'Wrong FIT format: no timestamp'
          is shown.
 
+config BUTTON_CMD
+       bool "Support for running a command if a button is held during boot"
+       depends on CMDLINE
+       depends on BUTTON
+       help
+         For many embedded devices it's useful to enter a special flashing mode
+         such as fastboot mode when a button is held during boot. This option
+         allows arbitrary commands to be assigned to specific buttons. These will
+         be run after "preboot" if the button is held. Configuration is done via
+         the environment variables "button_cmd_N_name" and "button_cmd_N" where n is
+         the button number (starting from 0). e.g:
+
+           "button_cmd_0_name=vol_down"
+           "button_cmd_0=fastboot usb 0"
+
 menuconfig FIT
        bool "Flattened Image Tree (FIT)"
        select HASH
@@ -426,6 +441,7 @@ config VPL_BOOTSTD
 config BOOTSTD_FULL
        bool "Enhanced features for standard boot"
        default y if SANDBOX
+       imply BOOTSTD_DEFAULTS
        help
          This enables various useful features for standard boot, which are not
          essential for operation:
@@ -523,7 +539,7 @@ config BOOTMETH_EXTLINUX_PXE
 
 config BOOTMETH_EFILOADER
        bool "Bootdev support for EFI boot"
-       depends on BOOTEFI_BOOTMGR
+       depends on EFI_BINARY_EXEC
        default y
        help
          Enables support for EFI boot using bootdevs. This makes the
@@ -558,7 +574,7 @@ config BOOTMETH_DISTRO
        select BOOTMETH_SCRIPT if CMDLINE # E.g. Armbian uses scripts
        select BOOTMETH_EXTLINUX  # E.g. Debian uses these
        select BOOTMETH_EXTLINUX_PXE if CMD_PXE && CMD_NET && DM_ETH
-       select BOOTMETH_EFILOADER if BOOTEFI_BOOTMGR # E.g. Ubuntu uses this
+       select BOOTMETH_EFILOADER if EFI_BINARY_EXEC # E.g. Ubuntu uses this
 
 config SPL_BOOTMETH_VBE
        bool "Bootdev support for Verified Boot for Embedded (SPL)"
@@ -1687,7 +1703,7 @@ menu "Configuration editor"
 
 config CEDIT
        bool "Configuration editor"
-       depends on BOOTSTD
+       depends on EXPO
        help
          Provides a way to deal with board configuration and present it to
          the user for adjustment.