mail archive of the barebox mailing list
 help / color / mirror / Atom feed
From: Rouven Czerwinski <r.czerwinski@pengutronix.de>
To: barebox@lists.infradead.org
Cc: Rouven Czerwinski <r.czerwinski@pengutronix.de>
Subject: [PATCH 3/4] blspec: fix bootm_data initialization
Date: Tue, 15 Sep 2020 08:47:21 +0200	[thread overview]
Message-ID: <20200915064722.17355-3-r.czerwinski@pengutronix.de> (raw)
In-Reply-To: <20200915064722.17355-1-r.czerwinski@pengutronix.de>

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>
---
 common/blspec.c | 5 ++---
 1 file 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");
-- 
2.28.0


_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox

  parent reply	other threads:[~2020-09-15  6:47 UTC|newest]

Thread overview: 7+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-09-15  6:47 [PATCH 1/4] globalvar: add globalvar_set function Rouven Czerwinski
2020-09-15  6:47 ` [PATCH 2/4] blspec: only reset variable locations, not paths Rouven Czerwinski
2020-09-15  6:47 ` Rouven Czerwinski [this message]
2020-09-15  6:47 ` [PATCH 4/4] fastboot: only unset image, not loadaddr Rouven Czerwinski
2020-09-15  7:50 ` [PATCH 1/4] globalvar: add globalvar_set function Rouven Czerwinski
2020-09-15 12:38 ` Sascha Hauer
  -- strict thread matches above, loose matches on Subject: below --
2020-09-12  7:12 [PATCH 1/4] globalvar: add set_single function Rouven Czerwinski
2020-09-12  7:12 ` [PATCH 3/4] blspec: fix bootm_data initialization Rouven Czerwinski

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20200915064722.17355-3-r.czerwinski@pengutronix.de \
    --to=r.czerwinski@pengutronix.de \
    --cc=barebox@lists.infradead.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox