[PATCH 4/5] arm/qemuarm64: fix edk2 and test it

edk2 has been broken on qemuarm64 for an unknown amount of time.  Add it
to CI to prevent this from happening (until edk2 works on
qemuarm64-secureboot).

Signed-off-by: Jon Mason <[email protected]>
---
 .gitlab-ci.yml                                     | 1 +
 meta-arm/recipes-bsp/uefi/edk2-firmware_%.bbappend | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index f1a4fdc38240..048366bd46a3 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -271,6 +271,7 @@ qemuarm64:
   parallel:
     matrix:
       - DISTRO: poky-tiny
+        FIRMWARE: [u-boot, edk2]
         TESTING: testimage
       - VIRT: xen
 
diff --git a/meta-arm/recipes-bsp/uefi/edk2-firmware_%.bbappend b/meta-arm/recipes-bsp/uefi/edk2-firmware_%.bbappend
index b806bf8768e8..063136242bef 100644
--- a/meta-arm/recipes-bsp/uefi/edk2-firmware_%.bbappend
+++ b/meta-arm/recipes-bsp/uefi/edk2-firmware_%.bbappend
@@ -1,5 +1,5 @@
 COMPATIBLE_MACHINE:qemuarm64 = "qemuarm64"
-EDK2_PLATFORM:qemuarm64      = "ArmVirtQemu-AARCH64"
+EDK2_PLATFORM:qemuarm64      = "ArmVirtQemu-AArch64"
 EDK2_PLATFORM_DSC:qemuarm64  = "ArmVirtPkg/ArmVirtQemu.dsc"
 EDK2_BIN_NAME:qemuarm64      = "QEMU_EFI.fd"
 # No need for PXE booting in qemu, disable to reduce unnecessary noise
-- 
2.50.1 (Apple Git-155)