diff mbox series

[v4,04/10] configs/aarch64_efi_defconfig: build the EDK2 firmware from source

Message ID Oza7o8F2CNJZdTMIHIxcX4vg10BiNjLDXcKEmSrPrY@cp3-web-033.plabs.ch
State Superseded
Headers show
Series [v4,01/10] package/edk2-platforms: new package | expand

Commit Message

D. Olsson March 18, 2021, 3:42 p.m. UTC 
Prior to this, you had to manually download a pre-built EDK2 flash
device image (QEMU_EFI.fd) in order to boot this configuration with
QEMU. Now, the configuration is building EDK2 from source.

Signed-off-by: Dick Olsson <hi@senzilla.io>

---

Revision 4:

 * Addressed review items from Yann E. MORIN
 * Simplified resizing of the flash images with the trucate command

Revision 3:

 * post-image.sh will now provide resized flash devices
 * readme.txt suggests pflash instead of bios

Revision 2:

 * Explicitly added the default EDK2 platform to defconfig

Signed-off-by: Dick Olsson <hi@senzilla.io>
---
 board/aarch64-efi/post-image.sh | 6 +++++-
 board/aarch64-efi/readme.txt    | 9 ++++-----
 configs/aarch64_efi_defconfig   | 2 ++
 3 files changed, 11 insertions(+), 6 deletions(-)

Comments

Erico Nunes May 2, 2021, 10:41 a.m. UTC | #1 
On Thu, Mar 18, 2021 at 4:43 PM Dick Olsson <hi@senzilla.io> wrote:
> +       -drive file=output/images/QEMU_EFI_RESIZED.fd,if=pflash,format=raw \
> +       -drive file=output/images/QEMU_VARS_RESIZED.fd,if=pflash,format=raw \

These _RESIZED suffixes should be dropped with the new solution with truncate.
diff mbox series

Patch

diff --git a/board/aarch64-efi/post-image.sh b/board/aarch64-efi/post-image.sh
index f0214dc866..63a582d99a 100755
--- a/board/aarch64-efi/post-image.sh
+++ b/board/aarch64-efi/post-image.sh
@@ -1,5 +1,9 @@ 
-#!/bin/sh
+#!/bin/bash
 
 BOARD_DIR="$(dirname $0)"
 
 cp -f ${BOARD_DIR}/grub.cfg ${BINARIES_DIR}/efi-part/EFI/BOOT/grub.cfg
+
+# The QEMU virt machine expects flash devices to be 64M.
+truncate -s 64M "${BINARIES_DIR}/QEMU_EFI.fd"
+truncate -s 64M "${BINARIES_DIR}/QEMU_VARS.fd"
diff --git a/board/aarch64-efi/readme.txt b/board/aarch64-efi/readme.txt
index 65a6345b6c..d0f900c616 100644
--- a/board/aarch64-efi/readme.txt
+++ b/board/aarch64-efi/readme.txt
@@ -22,13 +22,12 @@  qemu-system-aarch64 \
 	-cpu cortex-a57 \
 	-m 512 \
 	-nographic \
-	-bios </path/to/QEMU_EFI.fd> \
+	-drive file=output/images/QEMU_EFI_RESIZED.fd,if=pflash,format=raw \
+	-drive file=output/images/QEMU_VARS_RESIZED.fd,if=pflash,format=raw \
 	-drive file=output/images/disk.img,if=none,format=raw,id=hd0 \
 	-device virtio-blk-device,drive=hd0 \
 	-netdev user,id=eth0 \
 	-device virtio-net-device,netdev=eth0
 
-Note that </path/to/QEMU_EFI.fd> needs to point to a valid aarch64 UEFI
-firmware image for qemu.
-It may be provided by your distribution as a edk2-aarch64 or AAVMF
-package, in path such as /usr/share/edk2/aarch64/QEMU_EFI.fd .
+Note that output/images/QEMU_*.fd are the flash device files built by
+the EDK2 package.
diff --git a/configs/aarch64_efi_defconfig b/configs/aarch64_efi_defconfig
index 99600575ed..0e8d7f8c1c 100644
--- a/configs/aarch64_efi_defconfig
+++ b/configs/aarch64_efi_defconfig
@@ -12,6 +12,8 @@  BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_EUDEV=y
 BR2_PACKAGE_HOST_GENIMAGE=y
 
 # Bootloader
+BR2_TARGET_EDK2=y
+BR2_TARGET_EDK2_PLATFORM_ARM_VIRT_QEMU=y
 BR2_TARGET_GRUB2=y
 BR2_TARGET_GRUB2_ARM64_EFI=y