From: Mario Kicherer <dev@kicherer.org>
Date: Mon, 30 Jan 2023 09:21:43 +0000 (+0100)
Subject: spl: spl-nor: return error if no valid image was loaded
X-Git-Url: http://git.dujemihanovic.xyz/login.html?a=commitdiff_plain;h=1aeedef93744da76fd1e6f5c3b139409fff57dc5;p=u-boot.git

spl: spl-nor: return error if no valid image was loaded

If only FIT images are enabled and loading the FIT image fails,
spl_nor_load_image() should return an error instead of zero.

Without this patch:

>>SPL: board_init_r()
spl_init
Trying to boot from NOR
Unsupported OS image.. Jumping nevertheless..
image entry point: 0x0

With patch:

>>SPL: board_init_r()
spl_init
Trying to boot from NOR
SPL: failed to boot from all boot devices (err=-6)
.### ERROR ### Please RESET the board ###

Signed-off-by: Mario Kicherer <dev@kicherer.org>
---

diff --git a/common/spl/spl_nor.c b/common/spl/spl_nor.c
index 1ef5e41262..5b65b96a77 100644
--- a/common/spl/spl_nor.c
+++ b/common/spl/spl_nor.c
@@ -121,6 +121,6 @@ static int spl_nor_load_image(struct spl_image_info *spl_image,
 					   &hdr);
 	}
 
-	return 0;
+	return -EINVAL;
 }
 SPL_LOAD_IMAGE_METHOD("NOR", 0, BOOT_DEVICE_NOR, spl_nor_load_image);