diff options
| author | Simon Glass <sjg@chromium.org> | 2020-09-10 20:21:17 -0600 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2020-10-09 11:59:51 -0400 |
| commit | 95fd4f3330a3845ebb09a7a3e2eb66a9f093b2df (patch) | |
| tree | 040216836b9621ddddfa096ddf47db371ebfd110 | |
| parent | 98eed0d4f9322832e1428887d7c37b4dde8c5317 (diff) | |
| download | u-boot-95fd4f3330a3845ebb09a7a3e2eb66a9f093b2df.tar.gz | |
Kconfig: Move CONFIG_BOOTDELAY under autoboot options
This option relates to autoboot, so move it there.
Signed-off-by: Simon Glass <sjg@chromium.org>
| -rw-r--r-- | common/Kconfig | 16 | ||||
| -rw-r--r-- | common/Kconfig.boot | 16 |
2 files changed, 16 insertions, 16 deletions
diff --git a/common/Kconfig b/common/Kconfig index 46f2dbffa8..17fbadc248 100644 --- 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 bb069e2c86..058e62a6ca 100644 --- 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 |