From: Simon Glass <sjg@chromium.org>
Date: Thu, 16 Jan 2025 01:27:15 +0000 (-0700)
Subject: vbe: Allow loading loadables if there is no firmware
X-Git-Tag: v2025.04-rc1~32^2~8
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=42fb767da4439e52282fb3f84046b25131573f82;p=pandora-u-boot.git

vbe: Allow loading loadables if there is no firmware

In some cases only the 'loadable' property is present in the FIT.
Handle this by loading the first such image.

Signed-off-by: Simon Glass <sjg@chromium.org>
---

diff --git a/boot/vbe_common.c b/boot/vbe_common.c
index 8fe278ba1a9..b935513d44c 100644
--- a/boot/vbe_common.c
+++ b/boot/vbe_common.c
@@ -183,6 +183,13 @@ int vbe_read_fit(struct udevice *blk, ulong area_offset, ulong area_size,
 			     IH_ARCH_DEFAULT, image_ph(phase, IH_TYPE_FIRMWARE),
 			     BOOTSTAGE_ID_FIT_SPL_START, FIT_LOAD_IGNORED,
 			     &load_addr, &len);
+	if (ret == -ENOENT) {
+		ret = fit_image_load(&images, addr, &fit_uname,
+				     &fit_uname_config, IH_ARCH_DEFAULT,
+				     image_ph(phase, IH_TYPE_LOADABLE),
+				     BOOTSTAGE_ID_FIT_SPL_START,
+				     FIT_LOAD_IGNORED, &load_addr, &len);
+	}
 	if (ret < 0)
 		return log_msg_ret("ld", ret);
 	node = ret;