| Message ID | 20230314151742.501440-2-jon.mason@arm.com |
|---|---|
| State | New |
| Headers | show |
| Series | [1/2] arm/edk2: update version and relocate edk2-basetools to be with edk2 | expand |
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 50e1ac11..9c52b106 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -103,6 +103,7 @@ fvp-base: parallel: matrix: - TESTING: testimage + - FIRMWARE: edk2 fvp-baser-aemv8r64: extends: .build diff --git a/meta-arm-bsp/conf/machine/include/fvp-common.inc b/meta-arm-bsp/conf/machine/include/fvp-common.inc index b6fc74da..233c734f 100644 --- a/meta-arm-bsp/conf/machine/include/fvp-common.inc +++ b/meta-arm-bsp/conf/machine/include/fvp-common.inc @@ -16,7 +16,7 @@ PREFERRED_PROVIDER_virtual/kernel ?= "linux-yocto" KERNEL_DEVICETREE = "arm/fvp-base-revc.dtb" -EXTRA_IMAGEDEPENDS += "trusted-firmware-a u-boot" +EXTRA_IMAGEDEPENDS += "trusted-firmware-a" # As this is a virtual target that will not be used in the real world there is # no need for real SSH keys. diff --git a/meta-arm-bsp/recipes-bsp/trusted-firmware-a/trusted-firmware-a-fvp.inc b/meta-arm-bsp/recipes-bsp/trusted-firmware-a/trusted-firmware-a-fvp.inc index 43340cdc..ca96b448 100644 --- a/meta-arm-bsp/recipes-bsp/trusted-firmware-a/trusted-firmware-a-fvp.inc +++ b/meta-arm-bsp/recipes-bsp/trusted-firmware-a/trusted-firmware-a-fvp.inc @@ -8,5 +8,5 @@ COMPATIBLE_MACHINE = "fvp-base" TFA_PLATFORM = "fvp" TFA_DEBUG = "1" TFA_MBEDTLS = "1" -TFA_UBOOT = "1" +TFA_UBOOT ?= "1" TFA_BUILD_TARGET = "bl1 bl2 bl31 dtbs fip"
The infrastructure for edk2 and fvp-base is already present, but not being used. Make the changes to get it compiling cleanly, and add it to CI. Note: testing is not passing because edk2 isn't booting an image Signed-off-by: Jon Mason <jon.mason@arm.com> --- .gitlab-ci.yml | 1 + meta-arm-bsp/conf/machine/include/fvp-common.inc | 2 +- .../recipes-bsp/trusted-firmware-a/trusted-firmware-a-fvp.inc | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-)