autoboot: Correct dependencies on CMDLINE

Make AUTOBOOT depend on CMDLINE since it is mostly meaningless without it.

Signed-off-by: Simon Glass <sjg@chromium.org>
Reviewed-by: Tom Rini <trini@konsulko.com>

diff --git a/boot/Kconfig b/boot/Kconfig
index d016b9c6ff1ac24a9a71f1408343ff25f8f9998c..ba586c88bdf9005d71f87d613ee3f3a2a745c735 100644 (file)
--- a/boot/Kconfig
+++ b/boot/Kconfig
@@ -1194,14 +1194,16 @@ menu "Autoboot options"
 
 config AUTOBOOT
        bool "Autoboot"
+       depends on CMDLINE
        default y
        help
          This enables the autoboot.  See doc/README.autoboot for detail.
 
+if AUTOBOOT
+
 config BOOTDELAY
        int "delay in seconds before automatically booting"
        default 2
-       depends on AUTOBOOT
        help
          Delay before automatically running bootcmd;
          set to 0 to autoboot with no delay, but you can stop it by key input.
@@ -1223,9 +1225,11 @@ config AUTOBOOT_KEYED
          U-Boot automatic booting process and bring the device
          to the U-Boot prompt for user input.
 
+if AUTOBOOT_KEYED
+
 config AUTOBOOT_FLUSH_STDIN
        bool "Enable flushing stdin before starting to read the password"
-       depends on AUTOBOOT_KEYED && !SANDBOX
+       depends on !SANDBOX
        help
          When this option is enabled stdin buffer will be flushed before
          starting to read the password.
@@ -1234,7 +1238,6 @@ config AUTOBOOT_FLUSH_STDIN
 
 config AUTOBOOT_PROMPT
        string "Autoboot stop prompt"
-       depends on AUTOBOOT_KEYED
        default "Autoboot in %d seconds\\n"
        help
          This string is displayed before the boot delay selected by
@@ -1250,7 +1253,6 @@ config AUTOBOOT_PROMPT
 
 config AUTOBOOT_ENCRYPTION
        bool "Enable encryption in autoboot stopping"
-       depends on AUTOBOOT_KEYED
        help
          This option allows a string to be entered into U-Boot to stop the
          autoboot.
@@ -1277,7 +1279,7 @@ config AUTOBOOT_SHA256_FALLBACK
 
 config AUTOBOOT_DELAY_STR
        string "Delay autobooting via specific input key / string"
-       depends on AUTOBOOT_KEYED && !AUTOBOOT_ENCRYPTION
+       depends on !AUTOBOOT_ENCRYPTION
        help
          This option delays the automatic boot feature by issuing
          a specific input key or string. If CONFIG_AUTOBOOT_DELAY_STR
@@ -1289,7 +1291,7 @@ config AUTOBOOT_DELAY_STR
 
 config AUTOBOOT_STOP_STR
        string "Stop autobooting via specific input key / string"
-       depends on AUTOBOOT_KEYED && !AUTOBOOT_ENCRYPTION
+       depends on !AUTOBOOT_ENCRYPTION
        help
          This option enables stopping (aborting) of the automatic
          boot feature only by issuing a specific input key or
@@ -1301,7 +1303,7 @@ config AUTOBOOT_STOP_STR
 
 config AUTOBOOT_KEYED_CTRLC
        bool "Enable Ctrl-C autoboot interruption"
-       depends on AUTOBOOT_KEYED && !AUTOBOOT_ENCRYPTION
+       depends on !AUTOBOOT_ENCRYPTION
        help
          This option allows for the boot sequence to be interrupted
          by ctrl-c, in addition to the "bootdelaykey" and "bootstopkey".
@@ -1310,7 +1312,7 @@ config AUTOBOOT_KEYED_CTRLC
 
 config AUTOBOOT_NEVER_TIMEOUT
        bool "Make the password entry never time-out"
-       depends on AUTOBOOT_KEYED && AUTOBOOT_ENCRYPTION && CRYPT_PW
+       depends on AUTOBOOT_ENCRYPTION && CRYPT_PW
        help
          This option removes the timeout from the password entry
          when the user first presses the <Enter> key before entering
@@ -1318,7 +1320,7 @@ config AUTOBOOT_NEVER_TIMEOUT
 
 config AUTOBOOT_STOP_STR_ENABLE
        bool "Enable fixed string to stop autobooting"
-       depends on AUTOBOOT_KEYED && AUTOBOOT_ENCRYPTION
+       depends on AUTOBOOT_ENCRYPTION
        help
          This option enables the feature to add a fixed stop
          string that is defined at compile time.
@@ -1349,9 +1351,12 @@ config AUTOBOOT_STOP_STR_SHA256
          includes a ":", the portion prior to the ":" will be treated
          as a salt value.
 
+endif  # AUTOBOOT_KEYED
+
+if !AUTOBOOT_KEYED
+
 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.
@@ -1366,6 +1371,10 @@ config AUTOBOOT_MENUKEY
          For example, 33 means "!" in ASCII, so pressing ! at boot would take
          this action.
 
+endif
+
+endif  # AUTOBOOT
+
 config AUTOBOOT_MENU_SHOW
        bool "Show a menu on boot"
        depends on CMD_BOOTMENU