| Message ID | 20211207181956.900131-1-ross.burton@arm.com |
|---|---|
| State | New |
| Headers | show |
| Series | [1/5] trusted-firmware-a: don't use virtual/trusted-firmware-a | expand |
On Tue, 7 Dec 2021 18:19:52 +0000, Ross Burton wrote: > There's no need to use virtual/trusted-firmware-a, as there's only one > provider of trusted-firmware-a: trusted-firmware-a. > > Applied, thanks! [1/5] trusted-firmware-a: don't use virtual/trusted-firmware-a commit: 0813344225674eb9c1e86175598a3f4142250c88 [2/5] arm/trusted-firmware-a: move SRCREV_FORMAT to common include commit: 8fb3c6c64505e649ad2e7810cff77fc6b71c0f88 [3/5] arm-bsp/trusted-firmware-a: explicitly set the full PV for corstone1000 commit: 377f6a08cfbfc05033e1b4029675337e43624859 [4/5] arm/trusted-firmware-a: add new recipe for 2.6 commit: 16f86aa00dc8b589ec47d08e89ed273727bb7f1d [5/5] arm-bsp/trusted-firmware-a: move most BSPs to TF-A 2.6 commit: 17d1be7b4a741ffa217e5edd514bc6b005bc95ac Best regards,
diff --git a/meta-arm-bsp/conf/machine/corstone500.conf b/meta-arm-bsp/conf/machine/corstone500.conf index e87d81d8..c9ab4064 100644 --- a/meta-arm-bsp/conf/machine/corstone500.conf +++ b/meta-arm-bsp/conf/machine/corstone500.conf @@ -16,7 +16,7 @@ PREFERRED_VERSION_linux-yocto ?= "5.3%" PREFERRED_VERSION_trusted-firmware-a ?= "2.5%" -EXTRA_IMAGEDEPENDS += "virtual/trusted-firmware-a u-boot" +EXTRA_IMAGEDEPENDS += "trusted-firmware-a u-boot" SERIAL_CONSOLES = "115200;ttyAMA0" diff --git a/meta-arm-bsp/conf/machine/fvp-common.inc b/meta-arm-bsp/conf/machine/fvp-common.inc index 5a4a5c62..799260ec 100644 --- a/meta-arm-bsp/conf/machine/fvp-common.inc +++ b/meta-arm-bsp/conf/machine/fvp-common.inc @@ -17,7 +17,7 @@ PREFERRED_PROVIDER_virtual/kernel ?= "linux-yocto" PREFERRED_VERSION_u-boot ?= "2021.10" PREFERRED_VERSION_trusted-firmware-a ?= "2.5%" -EXTRA_IMAGEDEPENDS += "virtual/trusted-firmware-a u-boot" +EXTRA_IMAGEDEPENDS += "trusted-firmware-a u-boot" # As this is a virtual target that will not be used in the real world there is # no need for real SSH keys. Disable rng-tools (which takes too long to diff --git a/meta-arm-bsp/conf/machine/include/corstone1000.inc b/meta-arm-bsp/conf/machine/include/corstone1000.inc index 0e1c896c..994fb06d 100644 --- a/meta-arm-bsp/conf/machine/include/corstone1000.inc +++ b/meta-arm-bsp/conf/machine/include/corstone1000.inc @@ -5,7 +5,7 @@ MACHINEOVERRIDES =. "corstone1000:" # TF-A TFA_PLATFORM = "corstone1000" PREFERRED_VERSION_trusted-firmware-a ?= "2.5%" -EXTRA_IMAGEDEPENDS += "virtual/trusted-firmware-a" +EXTRA_IMAGEDEPENDS += "trusted-firmware-a" TFA_BL2_BINARY = "bl2-corstone1000.bin" TFA_FIP_BINARY = "fip-corstone1000.bin" diff --git a/meta-arm-bsp/conf/machine/include/corstone700.inc b/meta-arm-bsp/conf/machine/include/corstone700.inc index 0ec385ab..8a03c00d 100644 --- a/meta-arm-bsp/conf/machine/include/corstone700.inc +++ b/meta-arm-bsp/conf/machine/include/corstone700.inc @@ -18,7 +18,7 @@ PREFERRED_VERSION_gcc-arm-none-eabi-native ?= "9-2020-q2-update" PREFERRED_PROVIDER_virtual/control-processor-firmware ?= "boot-firmware" EXTRA_IMAGEDEPENDS += " \ - virtual/trusted-firmware-a \ + trusted-firmware-a \ external-system \ u-boot \ virtual/control-processor-firmware \ diff --git a/meta-arm-bsp/conf/machine/include/tc.inc b/meta-arm-bsp/conf/machine/include/tc.inc index dd0b872e..9f0239bb 100644 --- a/meta-arm-bsp/conf/machine/include/tc.inc +++ b/meta-arm-bsp/conf/machine/include/tc.inc @@ -21,7 +21,6 @@ UBOOT_SIGN_KEYNAME = "dev_key" UBOOT_SIGN_KEYDIR = "${DEPLOY_DIR_IMAGE}/keys" FIT_GENERATE_KEYS = "1" -PREFERRED_PROVIDER_virtual/trusted-firmware-a ?= "trusted-firmware-a" PREFERRED_VERSION_trusted-firmware-a ?= "2.5%" PREFERRED_PROVIDER_virtual/kernel ?= "linux-arm64-ack" diff --git a/meta-arm-bsp/conf/machine/juno.conf b/meta-arm-bsp/conf/machine/juno.conf index 1000dadf..4a71d66d 100644 --- a/meta-arm-bsp/conf/machine/juno.conf +++ b/meta-arm-bsp/conf/machine/juno.conf @@ -23,7 +23,7 @@ PREFERRED_VERSION_linux-yocto ?= "5.4%" PREFERRED_VERSION_trusted-firmware-a ?= "2.5%" PREFERRED_VERSION_u-boot ?= "2020.07" -EXTRA_IMAGEDEPENDS += "virtual/trusted-firmware-a u-boot firmware-image-juno" +EXTRA_IMAGEDEPENDS += "trusted-firmware-a u-boot firmware-image-juno" # Juno u-boot configuration UBOOT_MACHINE = "vexpress_aemv8a_juno_defconfig" diff --git a/meta-arm-bsp/conf/machine/n1sdp.conf b/meta-arm-bsp/conf/machine/n1sdp.conf index 643212fb..95a04c05 100644 --- a/meta-arm-bsp/conf/machine/n1sdp.conf +++ b/meta-arm-bsp/conf/machine/n1sdp.conf @@ -27,7 +27,7 @@ MACHINE_ESSENTIAL_EXTRA_RDEPENDS += "linux-firmware-rtl8168" PREFERRED_VERSION_trusted-firmware-a ?= "2.5%" -EXTRA_IMAGEDEPENDS += "virtual/trusted-firmware-a" +EXTRA_IMAGEDEPENDS += "trusted-firmware-a" EXTRA_IMAGEDEPENDS += "virtual/control-processor-firmware" #UEFI EDK2 firmware diff --git a/meta-arm-bsp/conf/machine/sgi575.conf b/meta-arm-bsp/conf/machine/sgi575.conf index 4f917105..7e1e6036 100644 --- a/meta-arm-bsp/conf/machine/sgi575.conf +++ b/meta-arm-bsp/conf/machine/sgi575.conf @@ -10,7 +10,7 @@ EXTRA_IMAGEDEPENDS += "virtual/control-processor-firmware" PREFERRED_VERSION_trusted-firmware-a ?= "2.5%" -EXTRA_IMAGEDEPENDS += "virtual/trusted-firmware-a" +EXTRA_IMAGEDEPENDS += "trusted-firmware-a" KERNEL_IMAGETYPE ?= "Image" PREFERRED_PROVIDER_virtual/kernel ?= "linux-yocto" diff --git a/meta-arm-bsp/recipes-bsp/boot-firmware/boot-firmware_git.bb b/meta-arm-bsp/recipes-bsp/boot-firmware/boot-firmware_git.bb index 0a8e2df6..abd4e328 100644 --- a/meta-arm-bsp/recipes-bsp/boot-firmware/boot-firmware_git.bb +++ b/meta-arm-bsp/recipes-bsp/boot-firmware/boot-firmware_git.bb @@ -12,7 +12,7 @@ PV = "2020.02.10+git${SRCPV}" PROVIDES += "virtual/control-processor-firmware" -DEPENDS = "virtual/arm-none-eabi-gcc-native virtual/trusted-firmware-a" +DEPENDS = "virtual/arm-none-eabi-gcc-native trusted-firmware-a" inherit deploy diff --git a/meta-arm-bsp/recipes-bsp/images/firmware-image-juno.bb b/meta-arm-bsp/recipes-bsp/images/firmware-image-juno.bb index a79bab50..d65c074f 100644 --- a/meta-arm-bsp/recipes-bsp/images/firmware-image-juno.bb +++ b/meta-arm-bsp/recipes-bsp/images/firmware-image-juno.bb @@ -5,7 +5,7 @@ LICENSE = "BSD-3-Clause" SECTION = "firmware" LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/BSD-3-Clause;md5=550794465ba0ec5312d6919e203a55f9" -DEPENDS = "virtual/trusted-firmware-a virtual/kernel virtual/control-processor-firmware" +DEPENDS = "trusted-firmware-a virtual/kernel virtual/control-processor-firmware" PACKAGE_ARCH = "${MACHINE_ARCH}" diff --git a/meta-arm-bsp/recipes-bsp/scp-firmware/scp-firmware-n1sdp.inc b/meta-arm-bsp/recipes-bsp/scp-firmware/scp-firmware-n1sdp.inc index 1af68dde..a1e2af61 100644 --- a/meta-arm-bsp/recipes-bsp/scp-firmware/scp-firmware-n1sdp.inc +++ b/meta-arm-bsp/recipes-bsp/scp-firmware/scp-firmware-n1sdp.inc @@ -6,7 +6,7 @@ SCP_LOG_LEVEL = "INFO" COMPATIBLE_MACHINE:n1sdp = "n1sdp" DEPENDS += "fiptool-native" -DEPENDS += "virtual/trusted-firmware-a" +DEPENDS += "trusted-firmware-a" do_install:append() { fiptool \ diff --git a/meta-arm-bsp/recipes-bsp/trusted-firmware-m/trusted-firmware-m-corstone1000.inc b/meta-arm-bsp/recipes-bsp/trusted-firmware-m/trusted-firmware-m-corstone1000.inc index 68abc967..42648eaa 100644 --- a/meta-arm-bsp/recipes-bsp/trusted-firmware-m/trusted-firmware-m-corstone1000.inc +++ b/meta-arm-bsp/recipes-bsp/trusted-firmware-m/trusted-firmware-m-corstone1000.inc @@ -34,7 +34,7 @@ SRCREV_mcuboot = "29099e1d17f93ae1d09fe945ad191b703aacd3d8" # The install task signs the TF-A BL2 and FIP binaries. # So they need to be copied to the sysroot. Hence the dependencies below: -do_prepare_recipe_sysroot[depends]+= "virtual/trusted-firmware-a:do_populate_sysroot" +do_prepare_recipe_sysroot[depends]+= "trusted-firmware-a:do_populate_sysroot" # adding host images signing support require trusted-firmware-m-sign-host-images.inc diff --git a/meta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware-a.inc b/meta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware-a.inc index 243e641c..40c9e9e3 100644 --- a/meta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware-a.inc +++ b/meta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware-a.inc @@ -1,8 +1,6 @@ DESCRIPTION = "Trusted Firmware-A" LICENSE = "BSD-3-Clause & MIT" -PROVIDES = "virtual/trusted-firmware-a" - PACKAGE_ARCH = "${MACHINE_ARCH}" inherit deploy diff --git a/meta-arm/recipes-bsp/uefi/edk2-firmware_%.bbappend b/meta-arm/recipes-bsp/uefi/edk2-firmware_%.bbappend index 50777dcd..f65cb094 100644 --- a/meta-arm/recipes-bsp/uefi/edk2-firmware_%.bbappend +++ b/meta-arm/recipes-bsp/uefi/edk2-firmware_%.bbappend @@ -5,7 +5,7 @@ EDK2_BIN_NAME:qemuarm64-secureboot = "QEMU_EFI.fd" COMPATIBLE_MACHINE:qemu-generic-arm64 = "qemu-generic-arm64" -DEPENDS:append:qemu-generic-arm64 = " virtual/trusted-firmware-a coreutils-native" +DEPENDS:append:qemu-generic-arm64 = " trusted-firmware-a coreutils-native" EDK2_PLATFORM:qemu-generic-arm64 = "SbsaQemu" EDK2_PLATFORM_DSC:qemu-generic-arm64 = "Platform/Qemu/SbsaQemu/SbsaQemu.dsc" EDK2_BIN_NAME:qemu-generic-arm64 = "SBSA_FLASH0.fd"
There's no need to use virtual/trusted-firmware-a, as there's only one provider of trusted-firmware-a: trusted-firmware-a. Signed-off-by: Ross Burton <ross.burton@arm.com> --- meta-arm-bsp/conf/machine/corstone500.conf | 2 +- meta-arm-bsp/conf/machine/fvp-common.inc | 2 +- meta-arm-bsp/conf/machine/include/corstone1000.inc | 2 +- meta-arm-bsp/conf/machine/include/corstone700.inc | 2 +- meta-arm-bsp/conf/machine/include/tc.inc | 1 - meta-arm-bsp/conf/machine/juno.conf | 2 +- meta-arm-bsp/conf/machine/n1sdp.conf | 2 +- meta-arm-bsp/conf/machine/sgi575.conf | 2 +- meta-arm-bsp/recipes-bsp/boot-firmware/boot-firmware_git.bb | 2 +- meta-arm-bsp/recipes-bsp/images/firmware-image-juno.bb | 2 +- meta-arm-bsp/recipes-bsp/scp-firmware/scp-firmware-n1sdp.inc | 2 +- .../trusted-firmware-m/trusted-firmware-m-corstone1000.inc | 2 +- meta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware-a.inc | 2 -- meta-arm/recipes-bsp/uefi/edk2-firmware_%.bbappend | 2 +- 14 files changed, 12 insertions(+), 15 deletions(-)