[PATCH 06/16] Kconfig: Move CONFIG_BOOTDELAY under autoboot options
Simon Glass
sjg at chromium.org
Fri Sep 11 04:21:17 CEST 2020
This option relates to autoboot, so move it there.
Signed-off-by: Simon Glass <sjg at chromium.org>
---
common/Kconfig | 16 ----------------
common/Kconfig.boot | 16 ++++++++++++++++
2 files changed, 16 insertions(+), 16 deletions(-)
diff --git a/common/Kconfig b/common/Kconfig
index a350b66c4d0..cf492af3ff5 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 4c67510e6c8..e93475f1e42 100644
--- a/common/Kconfig.boot
+++ b/common/Kconfig.boot
@@ -700,6 +700,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
--
2.28.0.618.gf4bc123cb7-goog
More information about the U-Boot
mailing list