From a1ee6140bcfd15d5ab2fef05898a3c361ab1b9e4 Mon Sep 17 00:00:00 2001 From: Sascha Hauer Date: Wed, 3 Jul 2019 12:56:14 +0200 Subject: startup: Create global.linux.bootargs.dyn.* variables where they are needed 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 --- common/startup.c | 6 ------ 1 file changed, 6 deletions(-) (limited to 'common/startup.c') 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"); -- cgit v1.2.3