summaryrefslogtreecommitdiff
path: root/boot
diff options
context:
space:
mode:
authorNora Schiffer <[email protected]>2026-06-22 13:19:32 +0200
committerTom Rini <[email protected]>2026-07-03 10:11:11 -0600
commitc2abc606653e7eb1e8dbdbaaf1eac392689875ea (patch)
treea4cba4de5a0c86756089f043cc6e47fcc1c586de /boot
parent0f890963da2d463dd47ec77ef75b1324cc8064f9 (diff)
bootm: warn about load address for IH_TYPE_KERNEL_NOLOAD in FIT
The load address is ignored for IH_TYPE_KERNEL_NOLOAD. Instead of failing the boot when none is set, it makes more sense to warn when it *is* set. Signed-off-by: Nora Schiffer <[email protected]> Reviewed-by: Simon Glass <[email protected]>
Diffstat (limited to 'boot')
-rw-r--r--boot/bootm.c8
1 files changed, 7 insertions, 1 deletions
diff --git a/boot/bootm.c b/boot/bootm.c
index 7c9a6f82976..b1cc6fe6c5c 100644
--- a/boot/bootm.c
+++ b/boot/bootm.c
@@ -371,11 +371,17 @@ static int bootm_find_os(const char *cmd_name, const char *addr_fit)
images.os.end = fit_get_end(images.fit_hdr_os);
if (fit_image_get_load(images.fit_hdr_os, images.fit_noffset_os,
- &images.os.load)) {
+ &images.os.load) &&
+ images.os.type != IH_TYPE_KERNEL_NOLOAD) {
puts("Can't get image load address!\n");
bootstage_error(BOOTSTAGE_ID_FIT_LOADADDR);
return 1;
}
+ if (images.os.load && images.os.type == IH_TYPE_KERNEL_NOLOAD) {
+ puts("WARNING: load address set for kernel_noload image, ignoring\n");
+ images.os.load = 0;
+ }
+
break;
#endif
#ifdef CONFIG_ANDROID_BOOT_IMAGE