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 <nora.schiffer@ew.tq-group.com>
Reviewed-by: Simon Glass <sjg@chromium.org>

diff --git a/boot/bootm.c b/boot/bootm.c
index 7c9a6f8297604a19f2f1738a92e6f1ad4c52f2c1..b1cc6fe6c5c3f53a4bbf2b34c4d5cca351096371 100644 (file)
--- 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