| Message ID | 20220422151326.23359-1-jon.mason@arm.com |
|---|---|
| State | New |
| Headers | show |
| Series | [1/3] arm-bsp/juno: use virtual/bootloader for u-boot/edk2 | expand |
On Fri, 22 Apr 2022 11:13:24 -0400, Jon Mason wrote: > 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. Applied, thanks! [1/3] arm-bsp/juno: use virtual/bootloader for u-boot/edk2 commit: 2b6e3fc1d160566d31e1dad4630da0b8ce5686ed [2/3] arm/edk2-firmware: add PROVIDES virtual/bootloader commit: b37441921d732a707181619f6dfc40f602a77081 [3/3] CI: add testing for edk2 commit: 9f0c90506661b34d5546f5f9ae9a43f07ed78ee9 Best regards,
On Fri, 22 Apr 2022 11:13:24 -0400, Jon Mason wrote: > 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. Applied, thanks! [1/3] arm-bsp/juno: use virtual/bootloader for u-boot/edk2 commit: 2b6e3fc1d160566d31e1dad4630da0b8ce5686ed [2/3] arm/edk2-firmware: add PROVIDES virtual/bootloader commit: b37441921d732a707181619f6dfc40f602a77081 [3/3] CI: add testing for edk2 commit: 9f0c90506661b34d5546f5f9ae9a43f07ed78ee9 Best regards,
diff --git a/meta-arm-bsp/conf/machine/juno.conf b/meta-arm-bsp/conf/machine/juno.conf index 2da6ba6..fbff800 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 c7293c0..3ddd8cb 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
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 <jon.mason@arm.com> --- 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(-)