From: Ahmad Fatoum <a.fatoum@pengutronix.de>
To: barebox@lists.infradead.org
Cc: Ahmad Fatoum <a.fatoum@pengutronix.de>
Subject: [PATCH 1/2] startup: don't skip countdown if consoles were runtime enabled
Date: Thu, 21 Sep 2023 11:25:38 +0200 [thread overview]
Message-ID: <20230921092539.4142293-1-a.fatoum@pengutronix.de> (raw)
Systems with verified boot will disable at least console input by
default, but when presented with an unlock token, they may elect to
enable the console. Currently, the user needs to be really quick with
ctrl+c to abort the boot on the active console, so let's make the system
have a normal count down if a console has been activated by board code.
Signed-off-by: Ahmad Fatoum <a.fatoum@pengutronix.de>
---
common/startup.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/common/startup.c b/common/startup.c
index f96cff41429d..bbba72f89255 100644
--- a/common/startup.c
+++ b/common/startup.c
@@ -174,7 +174,7 @@ enum autoboot_state do_autoboot_countdown(void)
if (autoboot_state != AUTOBOOT_UNKNOWN)
return autoboot_state;
- if (IS_ENABLED(CONFIG_CONSOLE_DISABLE_INPUT)) {
+ if (!console_get_first_active()) {
printf("\nNon-interactive console, booting system\n");
return autoboot_state = AUTOBOOT_BOOT;
}
--
2.39.2
next reply other threads:[~2023-09-21 9:27 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-09-21 9:25 Ahmad Fatoum [this message]
2023-09-21 9:25 ` [PATCH 2/2] console: implement of_console_by_stdout_path helper Ahmad Fatoum
2023-09-21 12:09 ` [PATCH 1/2] startup: don't skip countdown if consoles were runtime enabled Sascha Hauer
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=20230921092539.4142293-1-a.fatoum@pengutronix.de \
--to=a.fatoum@pengutronix.de \
--cc=barebox@lists.infradead.org \
/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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox