From: Sascha Hauer <s.hauer@pengutronix.de>
To: Barebox List <barebox@lists.infradead.org>
Subject: [PATCH 2/4] startup: Create global.linux.bootargs.dyn.* variables where they are needed
Date: Thu, 4 Jul 2019 08:44:51 +0200 [thread overview]
Message-ID: <20190704064453.11772-2-s.hauer@pengutronix.de> (raw)
In-Reply-To: <20190704064453.11772-1-s.hauer@pengutronix.de>
global.linux.bootargs.dyn.* variables are exclusively used in boot
scripts, so create them right before executing a script. This moves
the corresponding code from the unrelated startup code to the place
where the variables are used.
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
---
common/boot.c | 2 ++
common/startup.c | 6 ------
2 files changed, 2 insertions(+), 6 deletions(-)
diff --git a/common/boot.c b/common/boot.c
index 974eaf5d02..84b2ff9677 100644
--- a/common/boot.c
+++ b/common/boot.c
@@ -92,6 +92,8 @@ static int bootscript_boot(struct bootentry *entry, int verbose, int dryrun)
return 0;
}
+ globalvar_add_simple("linux.bootargs.dyn.ip", NULL);
+ globalvar_add_simple("linux.bootargs.dyn.root", NULL);
globalvar_set_match("linux.bootargs.dyn.", "");
ret = run_command(bs->scriptpath);
diff --git a/common/startup.c b/common/startup.c
index 749db18e5a..7e5a167af1 100644
--- a/common/startup.c
+++ b/common/startup.c
@@ -154,8 +154,6 @@ static const char * const global_autoboot_abort_keys[] = {
static int global_autoboot_timeout = 3;
static char *global_boot_default;
static char *global_linux_bootargs_base;
-static char *global_linux_bootargs_dyn_ip;
-static char *global_linux_bootargs_dyn_root;
static char *global_user;
static bool test_abort(void)
@@ -225,10 +223,6 @@ static int run_init(void)
globalvar_add_simple_string("boot.default", &global_boot_default);
globalvar_add_simple_string("linux.bootargs.base",
&global_linux_bootargs_base);
- globalvar_add_simple_string("linux.bootargs.dyn.ip",
- &global_linux_bootargs_dyn_ip);
- globalvar_add_simple_string("linux.bootargs.dyn.root",
- &global_linux_bootargs_dyn_root);
/* 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 ` Sascha Hauer [this message]
2019-07-04 6:44 ` [PATCH 3/4] startup: Create boot related variables where they are used Sascha Hauer
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-2-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