mail archive of the barebox mailing list
 help / color / mirror / Atom feed
From: Ahmad Fatoum <a.fatoum@pengutronix.de>
To: barebox@lists.infradead.org
Cc: Ahmad Fatoum <a.fatoum@pengutronix.de>
Subject: [PATCH 3/7] blspec: don't clobber bootm.image on boot attempt
Date: Fri, 14 Feb 2025 11:48:13 +0100	[thread overview]
Message-ID: <20250214104817.2975052-4-a.fatoum@pengutronix.de> (raw)
In-Reply-To: <20250214104817.2975052-1-a.fatoum@pengutronix.de>

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@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




  parent reply	other threads:[~2025-02-14 10:49 UTC|newest]

Thread overview: 11+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2025-02-14 10:48 [PATCH 0/7] commands: boot: add support for overriding boot artifacts Ahmad Fatoum
2025-02-14 10:48 ` [PATCH 1/7] bootm: add helper functions for checking if FIT image is used Ahmad Fatoum
2025-02-14 10:48 ` [PATCH 2/7] boot: move global.linux.bootargs.dyn. to common code Ahmad Fatoum
2025-02-14 10:48 ` Ahmad Fatoum [this message]
2025-02-14 10:48 ` [PATCH 4/7] fastboot: drop useless bootm.image clobber Ahmad Fatoum
2025-02-14 10:48 ` [PATCH 5/7] bootm: don't clobber global.bootm. variables after script boot fails Ahmad Fatoum
2025-02-14 10:48 ` [PATCH 6/7] bootm: retire bootm_has_initrd Ahmad Fatoum
2025-02-14 20:02   ` [PATCH] fixup! " Ahmad Fatoum
2025-02-14 10:48 ` [PATCH 7/7] commands: boot: add support for overriding boot artifacts Ahmad Fatoum
2025-02-15 12:29   ` [PATCH] fixup! " Ahmad Fatoum
2025-02-17  9:27 ` [PATCH 0/7] " Sascha Hauer

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=20250214104817.2975052-4-a.fatoum@pengutronix.de \
    --to=a.fatoum@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