Skip to contentSkip to conversation

CI: remove xorg test removal from edk2

PATCH New Jon Mason 1 participant 2 messages Jul 12, 2024

lore
Share & tools
lore

Jon Mason

author
#0 lore raw

PATCH 1/2 CI: remove xorg test removal from edk2

The edk file removed xorg from being tested, which is currently working on qemuarm and qemuarm64. Also, the section name collies with one in fvp.yml, which has other things that are removed. Remove this removal to get things working as expected.

---
 ci/edk2.yml | 2 --
 1 file changed, 2 deletions(-)
ci/edk2.yml +0 -2
index d32e3645cd9e..cf2f5851b85d 100644
@@ -15,5 +15,3 @@ local_conf_header:
 
     QB_DEFAULT_BIOS = "QEMU_EFI.fd"
     WKS_FILE ?= "efi-disk.wks.in"
-  failing_tests: |
-    TEST_SUITES:remove = "xorg"
Signature · 1 line
2.39.3 (Apple Git-146)
author
#1 lore raw

PATCH 2/2 arm-bsp/fvp-base: add edk2 testimage support

Add the changes necessary to get edk2 booting and testimage passing on fvp-base. All that is really necessary is adding the dtb to the too partition.

---
 .gitlab-ci.yml                          | 3 ++-
 meta-arm-bsp/conf/machine/fvp-base.conf | 3 ++-
 meta-arm/wic/efi-disk.wks.in            | 2 +-
 3 files changed, 5 insertions(+), 3 deletions(-)
.gitlab-ci.yml +2 -1
index 5eaf455ed930..7354bf35049c 100644
@@ -190,7 +190,8 @@ fvp-base:
     matrix:
       - TS: [none, fvp-base-ts]
         TESTING: testimage
-      - FIRMWARE: edk2
+      - FIRMWARE: [u-boot, edk2]
+        TESTING: testimage
       - SYSTEMREADY_FIRMWARE: arm-systemready-firmware
 
 arm-systemready-ir-acs:
meta-arm-bsp/conf/machine/fvp-base.conf +2 -1
index 24d03e7124af..353024e26b72 100644
@@ -20,7 +20,8 @@ WKS_FILE ?= "efi-disk.wks.in"
 SERIAL_CONSOLES = "115200;ttyAMA0"
 
 PREFERRED_PROVIDER_virtual/kernel ?= "linux-yocto"
-KERNEL_DEVICETREE = "arm/fvp-base-revc.dtb"
+KERNEL_DTB_NAME = "fvp-base-revc.dtb"
+KERNEL_DEVICETREE = "arm/${KERNEL_DTB_NAME}"
 KERNEL_IMAGETYPE = "Image"
 
 EXTRA_IMAGEDEPENDS += "trusted-firmware-a"
meta-arm/wic/efi-disk.wks.in +1 -1
index 1f06830a5fcd..198ae2a6d0b8 100644
@@ -2,7 +2,7 @@
 # long-description: Creates a partitioned EFI disk image that the user
 # can directly dd to boot media.
 
-part /boot --source bootimg-efi --sourceparams="loader=${EFI_PROVIDER}" --label boot --active --align 1024 --use-uuid
+part /boot --source bootimg-efi --sourceparams="loader=${EFI_PROVIDER},dtb=${KERNEL_DTB_NAME}" --label boot --active --align 1024 --use-uuid
 
 part / --source rootfs --fstype=ext4 --label root --align 1024 --use-uuid
 
Signature · 1 line
2.39.3 (Apple Git-146)