* [PATCH master] bootm: fix initrd pr_info
@ 2026-02-04 20:39 Marco Felsch
2026-02-09 13:49 ` Sascha Hauer
0 siblings, 1 reply; 2+ messages in thread
From: Marco Felsch @ 2026-02-04 20:39 UTC (permalink / raw)
To: barebox
The initrd is NULL if provided via a FIT, this leads to unwanted prints
like:
| Loaded initrd from Flattened Image Tree <NULL> to 0x0000000043e70000-0x000000004409a38a
Fix this by checking the initrd and pass an empty sting if not set.
While on it fix the superfluous newline.
Fixes: b62b21eddf30 ("bootm: refactor for readability and extensibility")
Signed-off-by: Marco Felsch <m.felsch@pengutronix.de>
---
common/bootm.c | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/common/bootm.c b/common/bootm.c
index 11c560fa2788..631850988489 100644
--- a/common/bootm.c
+++ b/common/bootm.c
@@ -318,14 +318,13 @@ bootm_load_initrd(struct image_data *data, unsigned long load_address)
} else if (data->os_fit) {
res = bootm_load_fit_initrd(data, load_address);
type = filetype_fit;
-
}
if (IS_ERR_OR_NULL(res))
return res;
pr_info("Loaded initrd from %s %s%s%s to %pa-%pa\n",
- file_type_to_string(type), initrd,
+ file_type_to_string(type), initrd ?: "",
initrd_part ? "@" : "", initrd_part ?: "",
&res->start, &res->end);
--
2.47.3
^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: [PATCH master] bootm: fix initrd pr_info
2026-02-04 20:39 [PATCH master] bootm: fix initrd pr_info Marco Felsch
@ 2026-02-09 13:49 ` Sascha Hauer
0 siblings, 0 replies; 2+ messages in thread
From: Sascha Hauer @ 2026-02-09 13:49 UTC (permalink / raw)
To: barebox, Marco Felsch
On Wed, 04 Feb 2026 21:39:44 +0100, Marco Felsch wrote:
> The initrd is NULL if provided via a FIT, this leads to unwanted prints
> like:
>
> | Loaded initrd from Flattened Image Tree <NULL> to 0x0000000043e70000-0x000000004409a38a
>
> Fix this by checking the initrd and pass an empty sting if not set.
> While on it fix the superfluous newline.
>
> [...]
Applied, thanks!
[1/1] bootm: fix initrd pr_info
https://git.pengutronix.de/cgit/barebox/commit/?id=0730f1ea9e49 (link may not be stable)
Best regards,
--
Sascha Hauer <s.hauer@pengutronix.de>
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2026-02-09 13:49 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2026-02-04 20:39 [PATCH master] bootm: fix initrd pr_info Marco Felsch
2026-02-09 13:49 ` Sascha Hauer
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox