mail archive of the barebox mailing list
 help / color / mirror / Atom feed
From: Ahmad Fatoum <a.fatoum@pengutronix.de>
To: barebox@lists.infradead.org
Cc: Steffen Hemer <S.Hemer@phytec.de>,
	Ahmad Fatoum <a.fatoum@pengutronix.de>
Subject: [PATCH master 1/4] console: define stub for console_get_first_active
Date: Mon, 20 Nov 2023 08:21:19 +0100	[thread overview]
Message-ID: <20231120072122.2006805-1-a.fatoum@pengutronix.de> (raw)

console_get_first_active() is unconditionally called in startup.c to
check if the boot countdown can be skipped. The function is not defined
for CONFIG_CONSOLE_NONE however. Provide a stub in that case, so the
code can be compiled again.

This changes behavior: Configured countdown for systems without consoles
will be ignored and the system will boot directly. This is deemed
acceptable as it aligns behavior with systems with consoles that are
exclusively non-interactive and on the off-chance that a board requires
delays, it can always add a late init call delaying the boot.

Fixes: 66232c0ca70f ("startup: don't skip countdown if consoles were runtime enabled")
Reported-by: Steffen Hemer <S.Hemer@phytec.de>
Signed-off-by: Ahmad Fatoum <a.fatoum@pengutronix.de>
---
 include/console.h | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/include/console.h b/include/console.h
index b8c901801e9f..018d47f69ef7 100644
--- a/include/console.h
+++ b/include/console.h
@@ -101,8 +101,6 @@ extern struct list_head console_list;
 
 extern int barebox_loglevel;
 
-struct console_device *console_get_first_active(void);
-
 int console_open(struct console_device *cdev);
 int console_close(struct console_device *cdev);
 int console_set_active(struct console_device *cdev, unsigned active);
@@ -201,6 +199,15 @@ static inline void pbl_set_putc(void (*putcf)(void *ctx, int c), void *ctx) {}
 
 bool console_allow_color(void);
 
+#ifndef CONFIG_CONSOLE_NONE
+struct console_device *console_get_first_active(void);
+#else
+static inline struct console_device *console_get_first_active(void)
+{
+	return NULL;
+}
+#endif
+
 #ifdef CONFIG_CONSOLE_FULL
 void console_ctrlc_allow(void);
 void console_ctrlc_forbid(void);
-- 
2.39.2




             reply	other threads:[~2023-11-20  7:23 UTC|newest]

Thread overview: 5+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-11-20  7:21 Ahmad Fatoum [this message]
2023-11-20  7:21 ` [PATCH master 2/4] console: add for_each_console stub Ahmad Fatoum
2023-11-20  7:21 ` [PATCH master 3/4] console: define barebox_set_loglevel Ahmad Fatoum
2023-11-20  7:21 ` [PATCH master 4/4] test: self: jwt: use barebox_set_loglevel Ahmad Fatoum
2023-11-21  6:57 ` [PATCH master 1/4] console: define stub for console_get_first_active 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=20231120072122.2006805-1-a.fatoum@pengutronix.de \
    --to=a.fatoum@pengutronix.de \
    --cc=S.Hemer@phytec.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