From c09f3cd0a7520ee21a3d019946040b649529ccfc Mon Sep 17 00:00:00 2001
From: Gerd Hoffmann <kraxel@redhat.com>
Date: Tue, 28 Mar 2023 14:11:34 +0200
Subject: [PATCH] add armvirt kernel builds

---
 edk2-build.fedora | 16 ++++++++++++++++
 edk2.spec         |  1 +
 2 files changed, 17 insertions(+)

diff --git a/edk2-build.fedora b/edk2-build.fedora
index 6b1edb8..ccbd4e5 100644
--- a/edk2-build.fedora
+++ b/edk2-build.fedora
@@ -36,6 +36,10 @@ DEBUG_PRINT_ERROR_LEVEL  = 0x8040004F
 [opts.armvirt.silent]
 DEBUG_PRINT_ERROR_LEVEL  = 0x80000000
 
+[opts.armvirt.kernel]
+TPM2_ENABLE              = FALSE
+TPM2_CONFIG_ENABLE       = FALSE
+
 
 [pcds.nx.strict]
 PcdDxeNxMemoryProtectionPolicy = 0xC000000000007FD5
@@ -170,6 +174,18 @@ cpy1 = FV/QEMU_EFI.fd  QEMU_EFI.silent.fd
 cpy2 = FV/QEMU_EFI.fd  QEMU_EFI-silent-pflash.raw
 pad2 = QEMU_EFI-silent-pflash.raw 64m
 
+[build.armvirt.aa64.kernel]
+desc = ArmVirt build for qemu, 64-bit (arm v8)
+conf = ArmVirtPkg/ArmVirtQemuKernel.dsc
+arch = AARCH64
+opts = ovmf.common
+       armvirt.silent
+       armvirt.kernel
+pcds = nx.broken.grub
+plat = ArmVirtQemuKernel-AARCH64
+dest = Fedora/aarch64
+cpy1 = FV/QEMU_EFI.fd  QEMU_EFI.kernel.fd
+
 
 #####################################################################
 # riscv
diff --git a/edk2.spec b/edk2.spec
index d51dc77..4fa104d 100644
--- a/edk2.spec
+++ b/edk2.spec
@@ -578,6 +578,7 @@ done
 %{_datadir}/%{name}/aarch64/QEMU_VARS.fd
 %if %{defined fedora}
 %{_datadir}/%{name}/aarch64/BL32_AP_MM.fd
+%{_datadir}/%{name}/aarch64/QEMU_EFI.kernel.fd
 %endif
 %{_datadir}/qemu/firmware/50-edk2-aarch64.json
 %{_datadir}/qemu/firmware/51-edk2-aarch64-verbose.json