[PATCH 3/7] blspec: don't clobber bootm.image on boot attempt
Ahmad Fatoum
a.fatoum at pengutronix.de
Fri Feb 14 02:48:13 PST 2025
bootm_data_init_defaults() initialized the defaults from global
variables and thus the blspec code cleared the global variables.
This roundabout way can be confusing to users as a failing bootloader
spec boot would clobber these variables.
Let's improve upon this by just ignoring the variables explicitly
instead of clobbering them.
Signed-off-by: Ahmad Fatoum <a.fatoum at pengutronix.de>
---
common/blspec.c | 6 +-----
1 file changed, 1 insertion(+), 5 deletions(-)
diff --git a/common/blspec.c b/common/blspec.c
index 8a7f996e78d2..1cbadf8963af 100644
--- a/common/blspec.c
+++ b/common/blspec.c
@@ -81,12 +81,8 @@ static int blspec_boot(struct bootentry *be, int verbose, int dryrun)
.dryrun = dryrun,
};
- globalvar_set("bootm.image", "");
- globalvar_set("bootm.oftree", "");
- globalvar_set("bootm.initrd", "");
-
bootm_data_init_defaults(&data);
-
+ data.os_file = data.oftree_file = data.initrd_file = NULL;
data.verbose = max(verbose, data.verbose);
devicetree = blspec_entry_var_get(entry, "devicetree");
--
2.39.5
More information about the barebox
mailing list