mail archive of the barebox mailing list
 help / color / mirror / Atom feed
* [PATCH] startup: Do not overwrite global.linux.bootargs.console
@ 2019-06-12  9:24 Sascha Hauer
  2019-06-12  9:56 ` Bastian Krause
  0 siblings, 1 reply; 2+ messages in thread
From: Sascha Hauer @ 2019-06-12  9:24 UTC (permalink / raw)
  To: Barebox List; +Cc: bst

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

^ permalink raw reply	[flat|nested] 2+ messages in thread

* Re: [PATCH] startup: Do not overwrite global.linux.bootargs.console
  2019-06-12  9:24 [PATCH] startup: Do not overwrite global.linux.bootargs.console Sascha Hauer
@ 2019-06-12  9:56 ` Bastian Krause
  0 siblings, 0 replies; 2+ messages in thread
From: Bastian Krause @ 2019-06-12  9:56 UTC (permalink / raw)
  To: Sascha Hauer, Barebox List

On 6/12/19 11:24 AM, Sascha Hauer wrote:
> 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>

Tested-by: Bastian Krause <bst@pengutronix.de>

Thanks,
Bastian

_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox

^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2019-06-12  9:56 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-06-12  9:24 [PATCH] startup: Do not overwrite global.linux.bootargs.console Sascha Hauer
2019-06-12  9:56 ` Bastian Krause

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox