From 2b6e3fc1d160566d31e1dad4630da0b8ce5686ed Mon Sep 17 00:00:00 2001 From: Jon Mason Date: Fri, 22 Apr 2022 11:13:24 -0400 Subject: [PATCH] arm-bsp/juno: use virtual/bootloader for u-boot/edk2 To setup juno to use either u-boot or edk2 in CI, abstract out the relevant parts and setup the parts to allow for it to be done dynamically. Signed-off-by: Jon Mason --- meta-arm-bsp/conf/machine/juno.conf | 3 ++- .../recipes-bsp/trusted-firmware-a/trusted-firmware-a-juno.inc | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/meta-arm-bsp/conf/machine/juno.conf b/meta-arm-bsp/conf/machine/juno.conf index 2da6ba66..fbff8001 100644 --- a/meta-arm-bsp/conf/machine/juno.conf +++ b/meta-arm-bsp/conf/machine/juno.conf @@ -19,8 +19,9 @@ SERIAL_CONSOLES = "115200;ttyAMA0" PREFERRED_PROVIDER_virtual/kernel ?= "linux-yocto" PREFERRED_VERSION_u-boot ?= "2020.07" +PREFERRED_PROVIDER_virtual/bootloader ?= "u-boot" -EXTRA_IMAGEDEPENDS += "trusted-firmware-a edk2-firmware u-boot firmware-image-juno" +EXTRA_IMAGEDEPENDS += "trusted-firmware-a virtual/bootloader firmware-image-juno" # Juno u-boot configuration UBOOT_MACHINE = "vexpress_aemv8a_juno_defconfig" diff --git a/meta-arm-bsp/recipes-bsp/trusted-firmware-a/trusted-firmware-a-juno.inc b/meta-arm-bsp/recipes-bsp/trusted-firmware-a/trusted-firmware-a-juno.inc index c7293c0d..3ddd8cb5 100644 --- a/meta-arm-bsp/recipes-bsp/trusted-firmware-a/trusted-firmware-a-juno.inc +++ b/meta-arm-bsp/recipes-bsp/trusted-firmware-a/trusted-firmware-a-juno.inc @@ -4,7 +4,7 @@ COMPATIBLE_MACHINE = "juno" TFA_PLATFORM = "juno" TFA_DEBUG = "1" TFA_MBEDTLS = "1" -TFA_UBOOT = "1" +TFA_UBOOT ?= "1" TFA_BUILD_TARGET = "bl1 bl2 bl31 dtbs fip" # Juno needs the System Control Processor Firmware