summaryrefslogtreecommitdiffstats
path: root/common/blspec.c
diff options
context:
space:
mode:
authorRouven Czerwinski <r.czerwinski@pengutronix.de>2019-07-02 09:17:54 +0200
committerSascha Hauer <s.hauer@pengutronix.de>2019-07-04 08:48:25 +0200
commit5249e7e7e8f1eba16fa496c38c4e8927de74818f (patch)
treed05d855996203ad67c5e23dd9afe373c2a0f1848 /common/blspec.c
parent35266d7e583f1bcc519f710f9f455127a14f31e8 (diff)
downloadbarebox-5249e7e7e8f1eba16fa496c38c4e8927de74818f.tar.gz
barebox-5249e7e7e8f1eba16fa496c38c4e8927de74818f.tar.xz
blspec: invalidate only necessary bootm variables
Instead of removing all global bootm variables, remove only the ones which will be set by the blspec entries. This allows setting the bootm.tee variable to load OP-TEE for blspec entries or setting the image load address. Signed-off-by: Rouven Czerwinski <r.czerwinski@pengutronix.de> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'common/blspec.c')
-rw-r--r--common/blspec.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/common/blspec.c b/common/blspec.c
index 41f2a4c534..66e5033e35 100644
--- a/common/blspec.c
+++ b/common/blspec.c
@@ -63,7 +63,11 @@ static int blspec_boot(struct bootentry *be, int verbose, int dryrun)
};
globalvar_set_match("linux.bootargs.dyn.", "");
- globalvar_set_match("bootm.", "");
+ globalvar_set_match("bootm.image", "");
+ globalvar_set_match("bootm.oftree", "");
+ globalvar_set_match("bootm.initrd", "");
+
+ bootm_data_init_defaults(&data);
devicetree = blspec_entry_var_get(entry, "devicetree");
initrd = blspec_entry_var_get(entry, "initrd");