[PATCH 2/2] ci: update edk2 yml file to work with qemuarm/qemuarm64

[Jon Mason <jon.mason@arm.com>]

Signed-off-by: Jon Mason <jon.mason@arm.com>
---
 .gitlab-ci.yml | 4 ++++
 ci/edk2.yml    | 6 ++++++
 ci/jobs-to-kas | 2 +-
 3 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 6532fd09..f91d678a 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -185,6 +185,9 @@ qemuarm64:
   extends: .build
   parallel:
     matrix:
+      - TOOLCHAINS: [gcc, clang]
+        EFI: [uboot, edk2]
+        TESTING: testimage
       - VIRT: xen
 
 qemuarm-secureboot:
@@ -199,6 +202,7 @@ qemuarm:
   parallel:
     matrix:
       - TOOLCHAINS: [gcc, clang]
+        EFI: [uboot, edk2]
         TESTING: testimage
       - VIRT: xen
 
diff --git a/ci/edk2.yml b/ci/edk2.yml
index 77eaee88..219ee28b 100644
--- a/ci/edk2.yml
+++ b/ci/edk2.yml
@@ -7,3 +7,9 @@ local_conf_header:
     MACHINE_FEATURES += "efi"
     TFA_UBOOT = "0"
     TFA_UEFI = "1"
+
+    EXTRA_IMAGEDEPENDS += "edk2-firmware"
+    EFI_PROVIDER ?= "grub-efi"
+
+    QB_DEFAULT_BIOS = "QEMU_EFI.fd"
+    WKS_FILE ?= "efi-disk.wks.in"
diff --git a/ci/jobs-to-kas b/ci/jobs-to-kas
index f442a22d..d6896b77 100755
--- a/ci/jobs-to-kas
+++ b/ci/jobs-to-kas
@@ -18,7 +18,7 @@ for i in $(echo $1 | cut -s -d ':' -f 2 | sed 's/[][,]//g'); do
 	# defaults, we can simply ignore those parameters.  They are necessary
 	# to pass in so that matrix can correctly setup all of the permutations
 	# of each individual run.
-	if [[ $i == 'none' || $i == 'gcc' || $i == 'glibc' ]]; then
+	if [[ $i == 'none' || $i == 'gcc' || $i == 'glibc' || $i == 'uboot' ]]; then
 		continue
 	fi
 	FILES+=":ci/$i.yml"
-- 
2.17.1