From: Sascha Hauer <s.hauer@pengutronix.de>
To: Barebox List <barebox@lists.infradead.org>
Cc: bst@pengutronix.de
Subject: [PATCH] startup: Do not overwrite global.linux.bootargs.console
Date: Wed, 12 Jun 2019 11:24:00 +0200 [thread overview]
Message-ID: <20190612092400.4879-1-s.hauer@pengutronix.de> (raw)
global.linux.bootargs.console already exists. It is created during
console registration with a value, so do not overwrite it with an
empty value during init sequence. Instead create the variable if it
doesn't exist, but keep the old value if it does exist.
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
---
common/startup.c | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
diff --git a/common/startup.c b/common/startup.c
index 9fac0eabbd..bbfa1edce0 100644
--- a/common/startup.c
+++ b/common/startup.c
@@ -155,7 +155,6 @@ static int global_autoboot_timeout = 3;
static char *global_boot_default;
static char *global_editcmd;
static char *global_linux_bootargs_base;
-static char *global_linux_bootargs_console;
static char *global_linux_bootargs_dyn_ip;
static char *global_linux_bootargs_dyn_root;
static char *global_user;
@@ -228,8 +227,7 @@ static int run_init(void)
globalvar_add_simple_string("editcmd", &global_editcmd);
globalvar_add_simple_string("linux.bootargs.base",
&global_linux_bootargs_base);
- globalvar_add_simple_string("linux.bootargs.console",
- &global_linux_bootargs_console);
+ globalvar_add_simple("linux.bootargs.console", NULL);
globalvar_add_simple_string("linux.bootargs.dyn.ip",
&global_linux_bootargs_dyn_ip);
globalvar_add_simple_string("linux.bootargs.dyn.root",
--
2.20.1
_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox
next reply other threads:[~2019-06-12 9:24 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-06-12 9:24 Sascha Hauer [this message]
2019-06-12 9:56 ` Bastian Krause
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=20190612092400.4879-1-s.hauer@pengutronix.de \
--to=s.hauer@pengutronix.de \
--cc=barebox@lists.infradead.org \
--cc=bst@pengutronix.de \
/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