diff options
| author | Rouven Czerwinski <r.czerwinski@pengutronix.de> | 2020-09-15 08:47:21 +0200 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2020-09-15 14:37:41 +0200 |
| commit | c0275ee22a0e52f876034ad60bbabec3beeff181 (patch) | |
| tree | ca95b5f64e6abc9688f42269b8a0f2b206557911 /common | |
| parent | 9625c69869076a92e131df78888ef8e5b47846d6 (diff) | |
| download | barebox-c0275ee22a0e52f876034ad60bbabec3beeff181.tar.gz barebox-c0275ee22a0e52f876034ad60bbabec3beeff181.tar.xz | |
blspec: fix bootm_data initialization
Remove initialization of the verbose struct member, it will be
overwritten by the call to bootm_data_init_defaults(). Also remove
members which are initialized in the call.
Verbose should be enabled if either the argument or variable is set, so
|| both.
Signed-off-by: Rouven Czerwinski <r.czerwinski@pengutronix.de>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'common')
| -rw-r--r-- | common/blspec.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/common/blspec.c b/common/blspec.c index 14c98d4f7b..7858df685f 100644 --- a/common/blspec.c +++ b/common/blspec.c @@ -130,9 +130,6 @@ 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, }; @@ -143,6 +140,8 @@ static int blspec_boot(struct bootentry *be, int verbose, int dryrun) 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"); |