[PATCH] startup: Do not overwrite global.linux.bootargs.console

Sascha Hauer s.hauer at pengutronix.de
Wed Jun 12 02:24:00 PDT 2019


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 at 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




More information about the barebox mailing list