mirrors/meta-arm
1
0
Fork 0
mirror of https://git.yoctoproject.org/meta-arm synced 2026-05-08 17:19:39 +00:00
Code Issues Projects Releases Wiki Activity

trusted-firmware-a: don't use virtual/trusted-firmware-a

Browse Source 
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>
Signed-off-by: Jon Mason <jon.mason@arm.com>
This commit is contained in:
Ross Burton
2021-12-07 18:19:52 +00:00
committed by Jon Mason
parent d16fd5e343
commit 0813344225
14 changed files with 12 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
meta-arm-bsp/conf/machine/corstone500.conf
+1 -1
View File
@@ -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"
meta-arm-bsp/conf/machine/fvp-common.inc
+1 -1
View File
@@ -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
meta-arm-bsp/conf/machine/include/corstone1000.inc
+1 -1
View File
@@ -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"
meta-arm-bsp/conf/machine/include/corstone700.inc
+1 -1
View File
@@ -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 \
meta-arm-bsp/conf/machine/include/tc.inc
-1
View File
@@ -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"
meta-arm-bsp/conf/machine/juno.conf
+1 -1
View File
@@ -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"
meta-arm-bsp/conf/machine/n1sdp.conf
+1 -1
View File
@@ -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
meta-arm-bsp/conf/machine/sgi575.conf
+1 -1
View File
@@ -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"
meta-arm-bsp/recipes-bsp/boot-firmware/boot-firmware_git.bb
+1 -1
View File
@@ -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
meta-arm-bsp/recipes-bsp/images/firmware-image-juno.bb
+1 -1
View File
@@ -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}"
meta-arm-bsp/recipes-bsp/scp-firmware/scp-firmware-n1sdp.inc
+1 -1
View File
@@ -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 \
meta-arm-bsp/recipes-bsp/trusted-firmware-m/trusted-firmware-m-corstone1000.inc
+1 -1
View File
@@ -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
meta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware-a.inc
-2
View File
@@ -1,8 +1,6 @@
DESCRIPTION = "Trusted Firmware-A"
LICENSE = "BSD-3-Clause & MIT"
PROVIDES = "virtual/trusted-firmware-a"
PACKAGE_ARCH = "${MACHINE_ARCH}"
inherit deploy
meta-arm/recipes-bsp/uefi/edk2-firmware_%.bbappend
+1 -1
View File
@@ -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"