From: Sascha Hauer <s.hauer@pengutronix.de>
To: Barebox List <barebox@lists.infradead.org>
Subject: [PATCH 3/4] startup: Create boot related variables where they are used
Date: Thu, 4 Jul 2019 08:44:52 +0200 [thread overview]
Message-ID: <20190704064453.11772-3-s.hauer@pengutronix.de> (raw)
In-Reply-To: <20190704064453.11772-1-s.hauer@pengutronix.de>
global.boot.default, global.linux.bootargs.base and global.user are
used in the boot code, so create them there.
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
---
common/boot.c | 18 ++++++++++++++----
common/startup.c | 10 ----------
2 files changed, 14 insertions(+), 14 deletions(-)
diff --git a/common/boot.c b/common/boot.c
index 84b2ff9677..14d4fe9d64 100644
--- a/common/boot.c
+++ b/common/boot.c
@@ -119,12 +119,22 @@ void boot_set_watchdog_timeout(unsigned int timeout)
boot_watchdog_timeout = timeout;
}
-static int init_boot_watchdog_timeout(void)
+static char *global_boot_default;
+static char *global_user;
+
+static int init_boot(void)
{
- return globalvar_add_simple_int("boot.watchdog_timeout",
- &boot_watchdog_timeout, "%u");
+ global_boot_default = xstrdup("net");
+ globalvar_add_simple_string("boot.default", &global_boot_default);
+ globalvar_add_simple_int("boot.watchdog_timeout",
+ &boot_watchdog_timeout, "%u");
+ globalvar_add_simple("linux.bootargs.base", NULL);
+ global_user = xstrdup("none");
+ globalvar_add_simple_string("user", &global_user);
+
+ return 0;
}
-late_initcall(init_boot_watchdog_timeout);
+late_initcall(init_boot);
BAREBOX_MAGICVAR_NAMED(global_watchdog_timeout, global.boot.watchdog_timeout,
"Watchdog enable timeout in seconds before booting");
diff --git a/common/startup.c b/common/startup.c
index 7e5a167af1..b88c4a00d3 100644
--- a/common/startup.c
+++ b/common/startup.c
@@ -152,9 +152,6 @@ static const char * const global_autoboot_abort_keys[] = {
"ctrl-c",
};
static int global_autoboot_timeout = 3;
-static char *global_boot_default;
-static char *global_linux_bootargs_base;
-static char *global_user;
static bool test_abort(void)
{
@@ -210,19 +207,12 @@ static int run_init(void)
return 0;
}
- global_user = xstrdup("none");
- globalvar_add_simple_string("user", &global_user);
- global_boot_default = xstrdup("net");
-
globalvar_add_simple_enum("autoboot_abort_key",
&global_autoboot_abort_key,
global_autoboot_abort_keys,
ARRAY_SIZE(global_autoboot_abort_keys));
globalvar_add_simple_int("autoboot_timeout",
&global_autoboot_timeout, "%u");
- globalvar_add_simple_string("boot.default", &global_boot_default);
- globalvar_add_simple_string("linux.bootargs.base",
- &global_linux_bootargs_base);
/* Unblank console cursor */
printf("\e[?25h");
--
2.20.1
_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox
next prev parent reply other threads:[~2019-07-04 6:45 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-07-04 6:44 [PATCH 1/4] startup: remove unused editcmd variable Sascha Hauer
2019-07-04 6:44 ` [PATCH 2/4] startup: Create global.linux.bootargs.dyn.* variables where they are needed Sascha Hauer
2019-07-04 6:44 ` Sascha Hauer [this message]
2019-07-04 6:44 ` [PATCH 4/4] startup: Factor out the autoboot counter to separate function 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=20190704064453.11772-3-s.hauer@pengutronix.de \
--to=s.hauer@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