vbe: Support loading SPL images
VBE needs to load different images from a FIT depending on the xPL phase
in use. The IH_PHASE value is used to select the image to load.
Add the required logic to handle this. For compatibility with the
SPL-loader driver, fill out a struct spl_image_info with the details
needed to boot the next phase.
This is good enough for VBE-simple but ABrec will need the full set of
bootstd features. So add a USE_BOOTMETH define to control this.
Signed-off-by: Simon Glass <sjg@chromium.org>
diff --git a/boot/vbe_common.h b/boot/vbe_common.h
index bfa3390..8411781 100644
--- a/boot/vbe_common.h
+++ b/boot/vbe_common.h
@@ -11,8 +11,18 @@
#include <linux/types.h>
+struct spl_image_info;
struct udevice;
+/*
+ * Controls whether we use a full bootmeth driver with VBE in this phase, or
+ * just access the information directly.
+ *
+ * For now VBE-simple uses the full bootmeth, but VBE-abrec does not, to reduce
+ * code size
+ */
+#define USE_BOOTMETH CONFIG_IS_ENABLED(BOOTMETH_VBE_SIMPLE)
+
enum {
MAX_VERSION_LEN = 256,
@@ -109,6 +119,7 @@
* @blk: Block device containing FIT
* @area_offset: Byte offset of the VBE area in @blk containing the FIT
* @area_size: Size of the VBE area
+ * @image: SPL image to fill in with details of the loaded image, or NULL
* @load_addrp: If non-null, returns the address where the image was loaded
* @lenp: If non-null, returns the size of the image loaded, in bytes
* @namep: If non-null, returns the name of the FIT-image node that was loaded
@@ -120,6 +131,7 @@
* FIT-parsing (see fit_image_load()).
*/
int vbe_read_fit(struct udevice *blk, ulong area_offset, ulong area_size,
- ulong *load_addrp, ulong *lenp, char **namep);
+ struct spl_image_info *image, ulong *load_addrp, ulong *lenp,
+ char **namep);
#endif /* __VBE_ABREC_H */