All of lore.kernel.org
 help / color / mirror / Atom feed
From: Simon Glass <sjg@chromium.org>
To: u-boot@lists.denx.de
Subject: [PATCH 06/16] Kconfig: Move CONFIG_BOOTDELAY under autoboot options
Date: Thu, 10 Sep 2020 20:21:17 -0600	[thread overview]
Message-ID: <20200910202100.6.I5f48caba0a2a8180b229e8b18eb177f234a976dd@changeid> (raw)
In-Reply-To: <20200911022127.3451713-1-sjg@chromium.org>

This option relates to autoboot, so move it there.

Signed-off-by: Simon Glass <sjg@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

  parent reply	other threads:[~2020-09-11  2:21 UTC|newest]

Thread overview: 21+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-09-11  2:21 [PATCH 00/16] Kconfig: Tidy up the top-level kconfig menu Simon Glass
2020-09-11  2:21 ` [PATCH 01/16] Kconfig: Add a 'Boot options' menu Simon Glass
2020-09-11  2:21 ` [PATCH 02/16] Kconfig: Move boot menu into common/ Simon Glass
2020-09-11  2:21 ` [PATCH 03/16] Kconfig: Move boot timing under boot options Simon Glass
2020-09-11  2:21 ` [PATCH 04/16] Kconfig: Move boot media " Simon Glass
2020-09-11  2:21 ` [PATCH 05/16] Kconfig: Move autoboot options " Simon Glass
2020-09-11  2:21 ` Simon Glass [this message]
2020-09-11  2:21 ` [PATCH 07/16] Kconfig: Move misc boot options under 'boot options' Simon Glass
2020-09-11  2:21 ` [PATCH 08/16] Kconfig: Move SUPPORT_RAW_INITRD under boot options Simon Glass
2020-09-11  2:21 ` [PATCH 09/16] Kconfig: Move DEFAULT_FDT_FILE " Simon Glass
2020-09-11  2:21 ` [PATCH 10/16] Kconfig: Create a new 'init options' menu Simon Glass
2020-09-11  2:21 ` [PATCH 11/16] Kconfig: Move startup hooks under init options Simon Glass
2020-09-11  2:21 ` [PATCH 12/16] Kconfig: MISC_INIT_R and BOARD_LATE_INIT -> start-up hooks Simon Glass
2020-09-11  2:21 ` [PATCH 13/16] Kconfig: Move VERSION_VARIABLE under environment Simon Glass
2020-09-11  2:21 ` [PATCH 14/16] Kconfig: Move BOUNCE_BUFFER under driver options Simon Glass
2020-09-11  2:21 ` [PATCH 15/16] Kconfig: Move BOARD_TYPES under init options Simon Glass
2020-09-11  2:21 ` [PATCH 16/16] Kconfig: Create a new tools menu Simon Glass
2020-09-11 16:11 ` [PATCH 00/16] Kconfig: Tidy up the top-level kconfig menu Tom Rini
2020-09-11 20:15   ` Simon Glass
2020-09-11 20:20     ` Tom Rini
2020-10-09 22:11 ` Tom Rini

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20200910202100.6.I5f48caba0a2a8180b229e8b18eb177f234a976dd@changeid \
    --to=sjg@chromium.org \
    --cc=u-boot@lists.denx.de \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.