From: Ahmad Fatoum <a.fatoum@pengutronix.de>
To: barebox@lists.infradead.org
Cc: Ahmad Fatoum <a.fatoum@pengutronix.de>
Subject: [PATCH] fixup! commands: boot: add support for overriding boot artifacts
Date: Sat, 15 Feb 2025 13:29:02 +0100 [thread overview]
Message-ID: <20250215122902.2858449-1-a.fatoum@pengutronix.de> (raw)
In-Reply-To: <20250214104817.2975052-8-a.fatoum@pengutronix.de>
This allows e.g. adding an initrd, when none was specified before.
Otherwise, we would run into a NULL pointer exception.
Signed-off-by: Ahmad Fatoum <a.fatoum@pengutronix.de>
---
common/bootm.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/common/bootm.c b/common/bootm.c
index dd9ba2eae3b2..fe4d51681d73 100644
--- a/common/bootm.c
+++ b/common/bootm.c
@@ -152,7 +152,7 @@ static bool bootm_get_override(char **oldpath, const char *newpath)
if (!newpath)
return false;
- if (oldpath && strcmp(*oldpath, newpath)) {
+ if (oldpath && !streq_ptr(*oldpath, newpath)) {
free(*oldpath);
*oldpath = *newpath ? xstrdup(newpath) : NULL;
}
--
2.39.5
next prev parent reply other threads:[~2025-02-15 12:32 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-02-14 10:48 [PATCH 0/7] " 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 ` [PATCH 3/7] blspec: don't clobber bootm.image on boot attempt Ahmad Fatoum
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 ` Ahmad Fatoum [this message]
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=20250215122902.2858449-1-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