Merge branch '2022-10-31-vbe-implement-the-full-firmware-flow'

To quote Simon:
This series provides an implementation of VBE from TPL through to U-Boot
proper, using VBE to load the relevant firmware stages. It buils a single
image.bin file containing all the phases:

   TPL - initial phase, loads VPL using binman symbols
   VPL - main firmware phase, loads SPL using VBE parameters
   SPL - loads U-Boot proper using VBE parameters
   U-Boot - final firmware phase, where OS booting is processed

This series does not include the OS-booting phase. That will be the
subject of a future series.

The implementation is entirely handled by sandbox. It should be possible
to enable this on a real board without much effort, but that is also the
subject of a future series.

1 files changed, 37 insertions, 0 deletions

diff --git a/include/vbe.h b/include/vbe.h
index b83f6f0c519..5ede8181b98 100644
--- a/include/vbe.h
+++ b/include/vbe.h
@@ -11,6 +11,43 @@
 #define __VBE_H
 
 /**
+ * enum vbe_phase_t - current phase of VBE
+ *
+ * VBE operates in two distinct phases. In VPL it has to choose which firmware
+ * to run (SPL, U-Boot, OP-TEE, etc.). It then carries on running until it gets
+ * to U-Boot, where it decides which OS to run
+ *
+ * @VBE_PHASE_FIRMWARE: Selecting the firmware to run
+ * @VBE_PHASE_OS: Selecting the Operating System to run
+ */
+enum vbe_phase_t {
+	VBE_PHASE_FIRMWARE,
+	VBE_PHASE_OS,
+};
+
+/**
+ * struct vbe_handoff - information about VBE progress
+ *
+ * @phases: Indicates which phases used the VBE bootmeth (1 << PHASE_...)
+ */
+struct vbe_handoff {
+	u8 phases;
+};
+
+/**
+ * vbe_phase() - get current VBE phase
+ *
+ * Returns: Current VBE phase
+ */
+static inline enum vbe_phase_t vbe_phase(void)
+{
+	if (IS_ENABLED(CONFIG_SPL_BUILD))
+		return VBE_PHASE_FIRMWARE;
+
+	return VBE_PHASE_OS;
+}
+
+/**
  * vbe_list() - List the VBE bootmeths
  *
  * This shows a list of the VBE bootmeth devices