| Message ID | 20231204171952.13471-1-jon.mason@arm.com |
|---|---|
| State | New |
| Headers | show |
| Series | [1/3] arm/trusted-firmware-a: move patch file to bbappend | expand |
On Mon, 04 Dec 2023 11:19:50 -0600, Jon Mason wrote: > TF-A is being patched in the recipe for qemuarm64-secureboot. This > should be done in the bbappend. > > Applied, thanks! [1/3] arm/trusted-firmware-a: move patch file to bbappend commit: f0d7b9db317e72300b71184014573564a2787cd0 [2/3] arm/trusted-firmware-a: update to 2.10 commit: 3835b78f03ab7c396323b6f5b0d52184e2ea3ca7 [3/3] arm/hafnium: update to v2.10 commit: 560075f050cecd1591834efd9a4d949dbc6ff355 Best regards,
diff --git a/meta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware-a_%.bbappend b/meta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware-a_%.bbappend index e58a0902..ca0448f5 100644 --- a/meta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware-a_%.bbappend +++ b/meta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware-a_%.bbappend @@ -6,6 +6,12 @@ COMPATIBLE_MACHINE:qemuarm-secureboot = "qemuarm-secureboot" # arm/aarch32. This is a known testing hole in TF-A. TOOLCHAIN:qemuarm-secureboot = "gcc" +# Enable passing TOS_FW_CONFIG from FIP package to Trusted OS. +FILESEXTRAPATHS:prepend:qemuarm64-secureboot := "${THISDIR}/files:" +SRC_URI:append:qemuarm64-secureboot = " \ + file://0001-Add-spmc_manifest-for-qemu.patch \ + " + TFA_PLATFORM:qemuarm64-secureboot = "qemu" TFA_PLATFORM:qemu-generic-arm64 = "qemu_sbsa" TFA_PLATFORM:qemuarm-secureboot = "qemu" diff --git a/meta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware-a_2.9.0.bb b/meta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware-a_2.9.0.bb index 5e526958..31a6a909 100644 --- a/meta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware-a_2.9.0.bb +++ b/meta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware-a_2.9.0.bb @@ -3,11 +3,6 @@ require trusted-firmware-a.inc # TF-A v2.9.0 SRCREV_tfa = "d3e71ead6ea5bc3555ac90a446efec84ef6c6122" -# Enable passing TOS_FW_CONFIG from FIP package to Trusted OS. -SRC_URI:append:qemuarm64-secureboot = " \ - file://0001-Add-spmc_manifest-for-qemu.patch \ - " - LIC_FILES_CHKSUM += "file://docs/license.rst;md5=b2c740efedc159745b9b31f88ff03dde" # mbedtls-3.4.0
TF-A is being patched in the recipe for qemuarm64-secureboot. This should be done in the bbappend. Signed-off-by: Jon Mason <jon.mason@arm.com> --- .../trusted-firmware-a/trusted-firmware-a_%.bbappend | 6 ++++++ .../trusted-firmware-a/trusted-firmware-a_2.9.0.bb | 5 ----- 2 files changed, 6 insertions(+), 5 deletions(-)