mail archive of the barebox mailing list
 help / color / mirror / Atom feed
From: Marco Felsch <m.felsch@pengutronix.de>
To: barebox@lists.infradead.org
Subject: [PATCH master] bootm: fix initrd pr_info
Date: Wed,  4 Feb 2026 21:39:44 +0100	[thread overview]
Message-ID: <20260204203955.1716104-1-m.felsch@pengutronix.de> (raw)

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




             reply	other threads:[~2026-02-04 20:40 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2026-02-04 20:39 Marco Felsch [this message]
2026-02-09 13:49 ` 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=20260204203955.1716104-1-m.felsch@pengutronix.de \
    --to=m.felsch@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