Kconfig: Move CONFIG_BOOTDELAY under autoboot options

This option relates to autoboot, so move it there.

Signed-off-by: Simon Glass <sjg@chromium.org>

diff --git a/common/Kconfig b/common/Kconfig
index 46f2dbffa82ab2945ce89fbdad2914502ae37a2d..17fbadc24850573b8d3fc1f07e9b1a73741e66f0 100644 (file)
--- a/common/Kconfig
+++ b/common/Kconfig
@@ -1,21 +1,5 @@
 source "common/Kconfig.boot"
 
-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.
-         set to -1 to disable autoboot.
-         set to -2 to autoboot with no delay and not check for abort
-
-         If this value is >= 0 then it is also used for the default delay
-         before starting the default entry in bootmenu. If it is < 0 then
-         a default value of 10s is used.
-
-         See doc/README.autoboot for details.
-
 config USE_BOOTARGS
        bool "Enable boot arguments"
        help

diff --git a/common/Kconfig.boot b/common/Kconfig.boot
index bb069e2c8603d2e9ef0019b0dec5cc7a8d8df983..058e62a6ca1c0b33935292e53393b2ff830b66f3 100644 (file)
--- a/common/Kconfig.boot
+++ b/common/Kconfig.boot
@@ -699,6 +699,22 @@ config AUTOBOOT
        help
          This enables the autoboot.  See doc/README.autoboot for detail.
 
+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.
+         set to -1 to disable autoboot.
+         set to -2 to autoboot with no delay and not check for abort
+
+         If this value is >= 0 then it is also used for the default delay
+         before starting the default entry in bootmenu. If it is < 0 then
+         a default value of 10s is used.
+
+         See doc/README.autoboot for details.
+
 config AUTOBOOT_KEYED
        bool "Stop autobooting via specific input key / string"
        default n