| Message ID | 20211129142330.4018944-3-ross.burton@arm.com |
|---|---|
| State | New |
| Headers | show |
| Series | [1/4] arm/edk2-firmware: upgrade to edk2-firmware 202108 | expand |
diff --git a/meta-arm-bsp/conf/machine/n1sdp.conf b/meta-arm-bsp/conf/machine/n1sdp.conf index 288d7608..643212fb 100644 --- a/meta-arm-bsp/conf/machine/n1sdp.conf +++ b/meta-arm-bsp/conf/machine/n1sdp.conf @@ -31,7 +31,7 @@ EXTRA_IMAGEDEPENDS += "virtual/trusted-firmware-a" EXTRA_IMAGEDEPENDS += "virtual/control-processor-firmware" #UEFI EDK2 firmware -EXTRA_IMAGEDEPENDS += "virtual/uefi-firmware" +EXTRA_IMAGEDEPENDS += "edk2-firmware" #grub-efi EFI_PROVIDER ?= "grub-efi" diff --git a/meta-arm-bsp/recipes-bsp/images/sdcard-image-n1sdp_0.1.bb b/meta-arm-bsp/recipes-bsp/images/sdcard-image-n1sdp_0.1.bb index 0ef68b9b..6f74159c 100644 --- a/meta-arm-bsp/recipes-bsp/images/sdcard-image-n1sdp_0.1.bb +++ b/meta-arm-bsp/recipes-bsp/images/sdcard-image-n1sdp_0.1.bb @@ -2,7 +2,7 @@ SUMMARY = "Firmware image recipe for generating SD-Card artifacts." inherit deploy nopackages -DEPENDS = "virtual/uefi-firmware \ +DEPENDS = "edk2-firmware \ virtual/control-processor-firmware \ n1sdp-board-firmware" diff --git a/meta-arm-bsp/recipes-bsp/trusted-firmware-a/trusted-firmware-a-sgi575.inc b/meta-arm-bsp/recipes-bsp/trusted-firmware-a/trusted-firmware-a-sgi575.inc index 84f679c1..5786ce0b 100644 --- a/meta-arm-bsp/recipes-bsp/trusted-firmware-a/trusted-firmware-a-sgi575.inc +++ b/meta-arm-bsp/recipes-bsp/trusted-firmware-a/trusted-firmware-a-sgi575.inc @@ -9,7 +9,7 @@ TFA_MBEDTLS = "1" TFA_UBOOT = "0" # Sgi575 needs the UEFI as bl33 -DEPENDS += "virtual/uefi-firmware" +DEPENDS += "edk2-firmware" EXTRA_OEMAKE += "BL33=${RECIPE_SYSROOT}/firmware/uefi.bin" EXTRA_OEMAKE += "TRUSTED_BOARD_BOOT=1 GENERATE_COT=1 ARM_ROTPK_LOCATION=devel_rsa \
Firmware isn't arbitarily interchangable as by definition it is specific to the platform, so use the real recipe name instead of a virtual name. Signed-off-by: Ross Burton <ross.burton@arm.com> --- meta-arm-bsp/conf/machine/n1sdp.conf | 2 +- meta-arm-bsp/recipes-bsp/images/sdcard-image-n1sdp_0.1.bb | 2 +- .../trusted-firmware-a/trusted-firmware-a-sgi575.inc | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-)