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 --- common/spl/spl_nor.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/common/spl/spl_nor.c b/common/spl/spl_nor.c index ffb3566d89..e75127b275 100644 --- a/common/spl/spl_nor.c +++ b/common/spl/spl_nor.c @@ -120,6 +120,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);