From: Ahmad Fatoum <ahmad@a3f.at>
To: barebox@lists.infradead.org
Subject: [PATCH] startup: add $global.autoboot to make behavior configurable
Date: Wed, 15 Apr 2020 11:36:00 +0200 [thread overview]
Message-ID: <20200415093600.1662643-1-ahmad@a3f.at> (raw)
We already have a autoboot_state variable that controls barebox init
behavior on startup:
* ABORT: abort and fall into shell
* MENU: display boot menu
* BOOT: boot directly without delay
* UNKNOWN: default; count down and then boot
Exporting this as a device parameter allows us to support some
different boot scenarios:
* ABORT boot always while debugging
* display MENU by default (e.g. for graphical boots)
Signed-off-by: Ahmad Fatoum <ahmad@a3f.at>
---
common/startup.c | 13 ++++++++++++-
1 file changed, 12 insertions(+), 1 deletion(-)
diff --git a/common/startup.c b/common/startup.c
index c417a4d0781a..ff890fa744ab 100644
--- a/common/startup.c
+++ b/common/startup.c
@@ -163,6 +163,13 @@ static const char * const global_autoboot_abort_keys[] = {
};
static int global_autoboot_timeout = 3;
+static const char * const autoboot_states[] = {
+ [AUTOBOOT_UNKNOWN] = "unknown",
+ [AUTOBOOT_ABORT] = "abort",
+ [AUTOBOOT_MENU] = "menu",
+ [AUTOBOOT_BOOT] = "boot",
+};
+
static bool test_abort(void)
{
bool do_abort = false;
@@ -194,7 +201,7 @@ static bool test_abort(void)
#define INITFILE "/env/bin/init"
#define MENUFILE "/env/menu/mainmenu"
-static enum autoboot_state autoboot_state = AUTOBOOT_UNKNOWN;
+static int autoboot_state = AUTOBOOT_UNKNOWN;
/**
* set_autoboot_state - set the autoboot state
@@ -285,6 +292,10 @@ static int run_init(void)
ARRAY_SIZE(global_autoboot_abort_keys));
globalvar_add_simple_int("autoboot_timeout",
&global_autoboot_timeout, "%u");
+ globalvar_add_simple_enum("autoboot",
+ &autoboot_state,
+ autoboot_states,
+ ARRAY_SIZE(autoboot_states));
setenv("PATH", "/env/bin");
--
2.20.1
_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox
next reply other threads:[~2020-04-15 9:36 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-04-15 9:36 Ahmad Fatoum [this message]
2020-04-20 14:08 ` Sascha Hauer
2020-04-22 7:29 ` Ahmad Fatoum
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=20200415093600.1662643-1-ahmad@a3f.at \
--to=ahmad@a3f.at \
--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