real-hw-test: build and deploy every architecture at once

'make artifacts' cross-compiles all supported architectures, and the USB
install copies every artifact under build/ to its removable-media path,
so one stick boots the test on any supported machine.

Author: phip1611

real-hw-test/Makefile

@@ -1,5 +1,6 @@
 CARGO ?= cargo
 ARCH ?= x86_64
+ARCHS := x86_64 aarch64
 
 ifeq ($(ARCH),x86_64)
 TARGET := x86_64-unknown-uefi
@@ -24,7 +25,7 @@ ARTIFACT := build/$(BOOT_NAME)
 BUILD := CARGO_TARGET_DIR=$(TARGET_DIR) $(CARGO) build --locked
 CLIPPY := CARGO_TARGET_DIR=$(TARGET_DIR) $(CARGO) clippy --locked
 
-.PHONY: all artifact check qemu qemu-tcg ci-qemu install clean
+.PHONY: all artifact artifacts check qemu qemu-tcg ci-qemu install clean
 
 all: artifact
 
@@ -35,6 +36,9 @@ $(ARTIFACT): FORCE
 	mkdir -p $(dir $(ARTIFACT))
 	cp $(BINARY) $(ARTIFACT)
 
+artifacts:
+	for arch in $(ARCHS); do $(MAKE) artifact ARCH=$$arch || exit 1; done
+
 check:
 	$(CARGO) fmt --check
 	$(CLIPPY) --target x86_64-unknown-uefi --release -- -D warnings
@@ -53,8 +57,9 @@ ci-qemu: artifact
 	ARCH="$(ARCH)" QEMU="$(QEMU)" OVMF="$(OVMF)" \
 		./scripts/run-qemu-ci.sh $(ARTIFACT)
 
+# Deploys every built architecture; 'make artifacts' first covers them all.
 install: artifact
-	USB_MOUNT="$(USB_MOUNT)" ./scripts/install-usb.sh $(ARTIFACT)
+	USB_MOUNT="$(USB_MOUNT)" ./scripts/install-usb.sh
 
 clean:
 	$(CARGO) clean --target-dir $(TARGET_DIR)

real-hw-test/README.md

@@ -13,8 +13,9 @@ written directly to a UART are deliberately short, recognizable test payloads.
 
 ## TL;DR
 
-1. Run `make artifact`, then deploy `build/BOOTX64.EFI` with `make install` to
-   a mounted GPT/FAT32 EFI partition.
+1. Run `make artifact` (or `make artifacts` for every architecture), then
+   deploy the built images with `make install` to a mounted GPT/FAT32 EFI
+   partition.
 2. Boot with a monitor and USB keyboard. Leave the monitor connected: it is the
    authoritative diagnostic channel after firmware serial ownership is released.
 3. Confirm the firmware baseline, configure the remote to 9600 8N1, and press
@@ -111,7 +112,8 @@ file build/BOOTX64.EFI
 
 The resulting file is `build/BOOTX64.EFI`. `make artifact ARCH=aarch64`
 produces `build/BOOTAA64.EFI` instead; every `make` target accepts the same
-`ARCH` variable.
+`ARCH` variable. `make artifacts` cross-compiles every supported architecture
+in one step.
 
 Run all static build checks with:
 
@@ -133,7 +135,10 @@ lsblk -o NAME,SIZE,TYPE,FSTYPE,FSVER,PTTYPE,MOUNTPOINTS
 make install USB_MOUNT=/run/media/$USER/EFI
 ```
 
-The file is copied to `EFI/BOOT/BOOTX64.EFI`. If the disk is not GPT, the
+Every artifact present in `build/` is copied to its removable-media path, so
+one stick can boot every architecture built beforehand (for example with
+`make artifacts`): `EFI/BOOT/BOOTX64.EFI`, `EFI/BOOT/BOOTAA64.EFI`, and so on.
+If the disk is not GPT, the
 filesystem is not FAT32, the path is not an exact mount point, or the mount is
 not writable, installation stops with a diagnostic. Unmount the partition
 cleanly before removing it.

real-hw-test/scripts/install-usb.sh

@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 set -euo pipefail
 
-artifact=${1:-build/BOOTX64.EFI}
+artifacts=("$@")
 mount_input=${USB_MOUNT:-}
 
 fail() {
@@ -13,9 +13,20 @@ for command in findmnt lsblk install readlink sync; do
     command -v "$command" >/dev/null 2>&1 || fail "required command is missing: $command"
 done
 
+# Without explicit arguments, deploy every architecture that has been built.
+if [[ ${#artifacts[@]} -eq 0 ]]; then
+    for artifact in build/BOOT*.EFI; do
+        [[ -e "$artifact" ]] && artifacts+=("$artifact")
+    done
+fi
+
 [[ -n "$mount_input" ]] || fail \
     "USB_MOUNT is unset; use 'make install USB_MOUNT=/path/to/mounted/efi-partition'"
-[[ -r "$artifact" ]] || fail "UEFI artifact is missing: $artifact (run 'make artifact')"
+[[ ${#artifacts[@]} -gt 0 ]] || fail \
+    "no UEFI artifacts in build/ (run 'make artifact' or 'make artifacts')"
+for artifact in "${artifacts[@]}"; do
+    [[ -r "$artifact" ]] || fail "UEFI artifact is missing: $artifact (run 'make artifact')"
+done
 
 mount_path=$(readlink -f -- "$mount_input") || fail "cannot resolve USB_MOUNT: $mount_input"
 [[ "$mount_path" != / ]] || fail "refusing to install into the root filesystem"
@@ -57,13 +68,15 @@ fat_version=$(lsblk -dnro FSVER "$source_device")
 [[ "$fat_version" == FAT32 ]] || fail \
     "$source_device reports '${fat_version:-an unknown FAT version}', expected FAT32"
 
-# The artifact already carries its architecture's removable-media file name.
-target=$mount_path/EFI/BOOT/$(basename "$artifact")
 echo "Installing to validated media:"
 echo "  disk:       $parent_device (GPT)"
 echo "  partition:  $source_device (FAT32)"
 echo "  mount:      $mount_path"
-echo "  destination: $target"
-install -D -m 0644 -- "$artifact" "$target"
-sync "$target"
+# Each artifact already carries its architecture's removable-media file name.
+for artifact in "${artifacts[@]}"; do
+    target=$mount_path/EFI/BOOT/$(basename "$artifact")
+    echo "  destination: $target"
+    install -D -m 0644 -- "$artifact" "$target"
+    sync "$target"
+done
 echo "Installation complete. Unmount the media cleanly before removing it."