diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2020-09-25 08:06:22 +0200 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2020-09-25 08:06:22 +0200 |
| commit | 1ab2e649dc0ccef7ee990b999e1d8f8c32e7cd24 (patch) | |
| tree | 66f02471e811228f4da2580109b7d26c68ebe90a /common | |
| parent | 39bdcdfb814a22c8143c04938268378e9994b7dd (diff) | |
| parent | 94c0b6c798f619bd45aa1411a2ffedba86cad063 (diff) | |
| download | barebox-1ab2e649dc0ccef7ee990b999e1d8f8c32e7cd24.tar.gz barebox-1ab2e649dc0ccef7ee990b999e1d8f8c32e7cd24.tar.xz | |
Merge branch 'for-next/mmc' into master
Diffstat (limited to 'common')
| -rw-r--r-- | common/blspec.c | 11 | ||||
| -rw-r--r-- | common/fastboot.c | 2 | ||||
| -rw-r--r-- | common/globalvar.c | 5 |
3 files changed, 11 insertions, 7 deletions
diff --git a/common/blspec.c b/common/blspec.c index ed66352d11..9499d32477 100644 --- a/common/blspec.c +++ b/common/blspec.c @@ -133,19 +133,18 @@ static int blspec_boot(struct bootentry *be, int verbose, int dryrun) const char *overlays; const char *appendroot; struct bootm_data data = { - .initrd_address = UIMAGE_INVALID_ADDRESS, - .os_address = UIMAGE_SOME_ADDRESS, - .verbose = verbose, .dryrun = dryrun, }; globalvar_set_match("linux.bootargs.dyn.", ""); - globalvar_set_match("bootm.image", ""); - globalvar_set_match("bootm.oftree", ""); - globalvar_set_match("bootm.initrd", ""); + globalvar_set("bootm.image", ""); + globalvar_set("bootm.oftree", ""); + globalvar_set("bootm.initrd", ""); bootm_data_init_defaults(&data); + data.verbose = verbose || data.verbose; + devicetree = blspec_entry_var_get(entry, "devicetree"); initrd = blspec_entry_var_get(entry, "initrd"); options = blspec_entry_var_get(entry, "options"); diff --git a/common/fastboot.c b/common/fastboot.c index 302720c43d..86e7997a0b 100644 --- a/common/fastboot.c +++ b/common/fastboot.c @@ -383,7 +383,7 @@ static void __maybe_unused cb_boot(struct fastboot *fb, const char *opt) fastboot_tx_print(fb, FASTBOOT_MSG_INFO, "Booting kernel..\n"); globalvar_set_match("linux.bootargs.dyn.", ""); - globalvar_set_match("bootm.image", ""); + globalvar_set("bootm.image", ""); data.os_file = fb->tempname; diff --git a/common/globalvar.c b/common/globalvar.c index 6ab4c1f68e..eefee73e7a 100644 --- a/common/globalvar.c +++ b/common/globalvar.c @@ -399,6 +399,11 @@ void globalvar_set_match(const char *match, const char *val) } } +void globalvar_set(const char *name, const char *val) +{ + dev_set_param(&global_device, name, val); +} + static int globalvar_simple_set(struct device_d *dev, struct param_d *p, const char *val) { struct device_d *rdev; |