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, 56 insertions, 16 deletions

diff --git a/arch/sandbox/dts/test.dts b/arch/sandbox/dts/test.dts
index db72c64b1e..25fd2bcab8 100644
--- a/arch/sandbox/dts/test.dts
+++ b/arch/sandbox/dts/test.dts
@@ -37,6 +37,8 @@
 		i2c0 = "/i2c@0";
 		mmc0 = "/mmc0";
 		mmc1 = "/mmc1";
+		mmc2 = "/mmc2";
+		mmc3 = "/mmc3";
 		pci0 = &pci0;
 		pci1 = &pci1;
 		pci2 = &pci2;
@@ -64,7 +66,7 @@
 		osd0 = "/osd";
 	};
 
-	binman {
+	binman: binman {
 	};
 
 	config {
@@ -78,6 +80,7 @@
 	};
 
 	bootstd {
+		u-boot,dm-vpl;
 		compatible = "u-boot,boot-std";
 
 		filename-prefixes = "/", "/boot/";
@@ -90,6 +93,46 @@
 		efi {
 			compatible = "u-boot,distro-efi";
 		};
+
+		/*
+		 * This is used for the VBE OS-request tests. A FAT filesystem
+		 * created in a partition with the VBE information appearing
+		 * before the parititon starts
+		 */
+		firmware0 {
+			u-boot,dm-vpl;
+			compatible = "fwupd,vbe-simple";
+			storage = "mmc1";
+			skip-offset = <0x200>;
+			area-start = <0x400>;
+			area-size = <0x1000>;
+			state-offset = <0x400>;
+			state-size = <0x40>;
+			version-offset = <0x800>;
+			version-size = <0x100>;
+		};
+
+		/*
+		 * This is used for the VBE VPL tests. The MMC device holds the
+		 * binman image.bin file. The test progresses through each phase
+		 * of U-Boot, loading each in turn from MMC.
+		 *
+		 * Note that the test enables this node (and mmc3) before
+		 * running U-Boot
+		 */
+		firmware1 {
+			u-boot,dm-vpl;
+			status = "disabled";
+			compatible = "fwupd,vbe-simple";
+			storage = "mmc3";
+			skip-offset = <0x400000>;
+			area-start = <0>;
+			area-size = <0xe00000>;
+			state-offset = <0xdffc00>;
+			state-size = <0x40>;
+			version-offset = <0xdffe00>;
+			version-size = <0x100>;
+		};
 	};
 
 	fuzzing-engine {
@@ -962,6 +1005,14 @@
 		compatible = "sandbox,mmc";
 	};
 
+	/* This is used for VBE VPL tests */
+	mmc3 {
+		status = "disabled";
+		compatible = "sandbox,mmc";
+		filename = "image.bin";
+		non-removable;
+	};
+
 	pch {
 		compatible = "sandbox,pch";
 	};
@@ -1404,21 +1455,6 @@
 			compatible = "denx,u-boot-fdt-test";
 			reg = <9 1>;
 		};
-
-		fwupd {
-			compatible = "simple-bus";
-			firmware0 {
-				compatible = "fwupd,vbe-simple";
-				storage = "mmc1";
-				area-start = <0x400>;
-				area-size = <0x1000>;
-				skip-offset = <0x200>;
-				state-offset = <0x400>;
-				state-size = <0x40>;
-				version-offset = <0x800>;
-				version-size = <0x100>;
-			};
-		};
 	};
 
 	translation-test@8000 {
@@ -1708,3 +1744,7 @@
 
 #include "sandbox_pmic.dtsi"
 #include "cros-ec-keyboard.dtsi"
+
+#ifdef CONFIG_SANDBOX_VPL
+#include "sandbox_vpl.dtsi"
+#endif