feat(xtask): add support for U-Boot

Author: mkroening

.github/workflows/ci.yml

@@ -48,14 +48,14 @@ jobs:
             packages: qemu-system-x86
             flags: --accel --sudo
           - arch: aarch64
-            packages: qemu-system-arm ipxe-qemu
+            packages: qemu-system-arm ipxe-qemu u-boot-qemu u-boot-tools
           - arch: aarch64_be
-            packages: qemu-system-arm ipxe-qemu
+            packages: qemu-system-arm ipxe-qemu u-boot-qemu u-boot-tools
           - arch: riscv64
             packages: qemu-system-misc
     runs-on: ${{ (matrix.arch == 'aarch64' || matrix.arch == 'aarch64_be') && 'ubuntu-24.04-arm' || 'ubuntu-24.04' }}
     steps:
-      - name: Install QEMU
+      - name: Install Packages
         run: |
           sudo apt-get update
           sudo apt-get install --no-install-recommends ${{ matrix.packages }}
@@ -92,6 +92,10 @@ jobs:
         if: matrix.arch == 'aarch64' || matrix.arch == 'aarch64_be'
       - run: cargo xtask ci qemu ${{ matrix.flags }} --target ${{ matrix.arch }}-elf --release
         if: matrix.arch == 'aarch64' || matrix.arch == 'aarch64_be'
+      - run: cargo xtask ci qemu ${{ matrix.flags }} --target ${{ matrix.arch }}-elf --u-boot
+        if: matrix.arch == 'aarch64'
+      - run: cargo xtask ci qemu ${{ matrix.flags }} --target ${{ matrix.arch }}-elf --u-boot --release
+        if: matrix.arch == 'aarch64'
       - run: cargo xtask ci qemu ${{ matrix.flags }} --target ${{ matrix.arch }}-sbi
         if: matrix.arch == 'riscv64'
       - run: cargo xtask ci qemu ${{ matrix.flags }} --target ${{ matrix.arch }}-sbi --release

xtask/src/ci/qemu.rs

@@ -24,6 +24,10 @@ pub struct Qemu {
 	#[arg(long)]
 	microvm: bool,
 
+	/// Run with U-Boot.
+	#[arg(long)]
+	u_boot: bool,
+
 	#[command(flatten)]
 	build: Build,
 
@@ -77,13 +81,35 @@ impl Qemu {
 	fn prepare_image(&self) -> Result<()> {
 		let sh = crate::sh()?;
 
-		if self.build.target() == Target::X86_64Uefi {
-			sh.create_dir("target/esp/efi/boot")?;
-			sh.copy_file(self.build.dist_object(), "target/esp/efi/boot/bootx64.efi")?;
-			sh.copy_file(
-				self.build.ci_image(self.image.as_deref().unwrap()),
-				"target/esp/efi/boot/hermit-app",
-			)?;
+		match self.build.target() {
+			Target::X86_64Uefi => {
+				sh.create_dir("target/esp/efi/boot")?;
+				sh.copy_file(self.build.dist_object(), "target/esp/efi/boot/bootx64.efi")?;
+				sh.copy_file(
+					self.build.ci_image(self.image.as_deref().unwrap()),
+					"target/esp/efi/boot/hermit-app",
+				)?;
+			}
+			Target::Aarch64Elf | Target::Aarch64BeElf if self.u_boot => {
+				sh.create_dir("target/boot")?;
+				sh.copy_file(self.build.dist_object(), "target/boot/hermit-loader")?;
+				sh.copy_file(
+					self.build.ci_image(self.image.as_deref().unwrap()),
+					"target/boot/hermit-app",
+				)?;
+
+				cmd!(
+					sh,
+					"mkimage -f xtask/src/ci/u-boot/boot.its target/boot/boot.scr"
+				)
+				.run()?;
+				cmd!(
+					sh,
+					"mkimage -E -f xtask/src/ci/u-boot/hermit.its target/boot/hermit.fit"
+				)
+				.run()?;
+			}
+			_ => (),
 		}
 
 		Ok(())
@@ -200,13 +226,20 @@ impl Qemu {
 					]
 				};
 				cpu_args.push("-semihosting".to_string());
-				cpu_args.push("-device".to_string());
-				cpu_args.push(format!(
-					"guest-loader,addr=0x48000000,initrd={}",
-					self.build
-						.ci_image(self.image.as_deref().unwrap())
-						.display()
-				));
+				if self.u_boot {
+					cpu_args.push("-bios".to_string());
+					cpu_args.push("/usr/lib/u-boot/qemu_arm64/u-boot.bin".to_string());
+					cpu_args.push("-drive".to_string());
+					cpu_args.push("format=raw,file=fat:rw:target/boot".to_string());
+				} else {
+					cpu_args.push("-device".to_string());
+					cpu_args.push(format!(
+						"guest-loader,addr=0x48000000,initrd={}",
+						self.build
+							.ci_image(self.image.as_deref().unwrap())
+							.display()
+					));
+				}
 				cpu_args
 			}
 			Target::Riscv64Sbi => {

xtask/src/ci/u-boot/boot.its

@@ -0,0 +1,18 @@
+/dts-v1/;
+
+/ {
+    description = "Script to boot Hermit on QEMU virt";
+
+    images {
+        default = "script-1";
+
+        script-1 {
+            data = /incbin/("./boot.txt");
+            type = "script";
+            compression = "none";
+            hash {
+                algo = "sha256";
+            };
+        };
+    };
+};

xtask/src/ci/u-boot/boot.txt

@@ -0,0 +1,13 @@
+load virtio 0:1 ${loadaddr} /hermit.fit
+iminfo
+
+fdt addr ${loadaddr}
+fdt get value hermit_load /images/ramdisk-1 load
+
+fdt addr ${fdt_addr}
+fdt mknode /chosen module@${hermit_load}
+fdt set /chosen/module@${hermit_load} compatible "multiboot,module\0multiboot,ramdisk"
+fdt set /chosen/module@${hermit_load} reg <${hermit_load} 0>
+fdt print
+
+bootm

xtask/src/ci/u-boot/hermit.its

@@ -0,0 +1,46 @@
+/dts-v1/;
+
+/ {
+    description = "Hermit FIT image";
+    #address-cells = <1>;
+
+    images {
+        kernel-1 {
+            description = "Hermit Loader";
+            data = /incbin/("../../../../target/boot/hermit-loader");
+            type = "kernel";
+            arch = "arm64";
+            os = "elf";
+            compression = "none";
+            load = <0x41000000>;
+            entry = <0x41000000>;
+            hash {
+                algo = "sha256";
+            };
+        };
+
+        ramdisk-1 {
+            description = "Hermit Kernel";
+            data = /incbin/("../../../../target/boot/hermit-app");
+            type = "ramdisk";
+            arch = "arm64";
+            os = "elf";
+            compression = "none";
+            load = <0x48000000>;
+            entry = <0x48000000>;
+            hash {
+                algo = "sha256";
+            };
+        };
+    };
+
+    configurations {
+        default = "conf-1";
+
+        conf-1 {
+            description = "Boot Hermit Loader with Kernel as ramdisk";
+            kernel = "kernel-1";
+            ramdisk = "ramdisk-1";
+        };
+    };
+};