arm/trusted-firmware-a: update to 2.9.0
PATCH 1/1 arm/trusted-firmware-a: update to 2.9.0
Update the trusted-firmware-a recipes to 2.9.0
Moving legacy recipes (2.8) for tc1 and corestone1000 to meta-arm-bsp
Signed-off-by Jon Mason <[email protected]>
---
.../conf/machine/include/corstone1000.inc | 2 +
meta-arm-bsp/conf/machine/include/tc.inc | 1 +
.../files/add-spmc_manifest-for-qemu.patch | 0
...01-Fix-FF-A-version-in-SPMC-manifest.patch | 11 +---
...1000-bl2-loads-fip-based-on-metadata.patch | 24 +++----
...emu-update-abi-between-spmd-and-spmc.patch | 0
.../files/rwx-segments.patch | 0
.../tf-a-tests-no-warn-rwx-segments.patch | 0
.../fiptool-native_2.8.6.bb | 0
...s_2.8.0.bbappend => tf-a-tests_%.bbappend} | 0
.../trusted-firmware-a/tf-a-tests_2.8.0.bb | 0
.../trusted-firmware-a-corstone1000.inc | 9 ++-
...bbappend => trusted-firmware-a_%.bbappend} | 0
.../trusted-firmware-a_2.8.6.bb | 2 +-
.../0001-Add-spmc_manifest-for-qemu.patch | 64 +++++++++++++++++++
.../fiptool-native_2.9.0.bb | 33 ++++++++++
.../trusted-firmware-a/tf-a-tests_2.9.0.bb | 54 ++++++++++++++++
.../trusted-firmware-a_2.9.0.bb | 17 +++++
18 files changed, 189 insertions(+), 28 deletions(-)
rename {meta-arm => meta-arm-bsp}/recipes-bsp/trusted-firmware-a/files/add-spmc_manifest-for-qemu.patch (100%)
rename {meta-arm => meta-arm-bsp}/recipes-bsp/trusted-firmware-a/files/feat-qemu-update-abi-between-spmd-and-spmc.patch (100%)
rename {meta-arm => meta-arm-bsp}/recipes-bsp/trusted-firmware-a/files/rwx-segments.patch (100%)
rename {meta-arm => meta-arm-bsp}/recipes-bsp/trusted-firmware-a/files/tf-a-tests-no-warn-rwx-segments.patch (100%)
rename {meta-arm => meta-arm-bsp}/recipes-bsp/trusted-firmware-a/fiptool-native_2.8.6.bb (100%)
rename meta-arm-bsp/recipes-bsp/trusted-firmware-a/{tf-a-tests_2.8.0.bbappend => tf-a-tests_%.bbappend} (100%)
rename {meta-arm => meta-arm-bsp}/recipes-bsp/trusted-firmware-a/tf-a-tests_2.8.0.bb (100%)
rename meta-arm-bsp/recipes-bsp/trusted-firmware-a/{trusted-firmware-a_2.8.%.bbappend => trusted-firmware-a_%.bbappend} (100%)
rename {meta-arm => meta-arm-bsp}/recipes-bsp/trusted-firmware-a/trusted-firmware-a_2.8.6.bb (92%)
create mode 100644 meta-arm/recipes-bsp/trusted-firmware-a/files/0001-Add-spmc_manifest-for-qemu.patch
create mode 100644 meta-arm/recipes-bsp/trusted-firmware-a/fiptool-native_2.9.0.bb
create mode 100644 meta-arm/recipes-bsp/trusted-firmware-a/tf-a-tests_2.9.0.bb
create mode 100644 meta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware-a_2.9.0.bbmeta-arm-bsp/conf/machine/include/corstone1000.inc +2 -0
@@ -5,6 +5,8 @@ MACHINEOVERRIDES =. "corstone1000:" # TF-A TFA_PLATFORM = "corstone1000" EXTRA_IMAGEDEPENDS += "trusted-firmware-a" +PREFERRED_VERSION_trusted-firmware-a ?= "2.8.%" +PREFERRED_VERSION_tf-a-tests ?= "2.8.%" TFA_BL2_BINARY = "bl2-corstone1000.bin" TFA_FIP_BINARY = "fip-corstone1000.bin"
meta-arm-bsp/conf/machine/include/tc.inc +1 -0
@@ -30,6 +30,7 @@ IMAGE_NAME_SUFFIX = "" SERIAL_CONSOLES = "115200;ttyAMA0" EXTRA_IMAGEDEPENDS += "trusted-firmware-a optee-os" +PREFERRED_VERSION_trusted-firmware-a ?= "2.8.%" # FIXME - there is signed image dependency/race with testimage. # This should be fixed in oe-core TESTIMAGEDEPENDS:append = " virtual/kernel:do_deploy"
meta-arm-bsp/recipes-bsp/trusted-firmware-a/files/add-spmc_manifest-for-qemu.patch renamed from meta-arm/recipes-bsp/trusted-firmware-a/files/add-spmc_manifest-for-qemu.patch +0 -0
meta-arm-bsp/recipes-bsp/trusted-firmware-a/files/corstone1000/0001-Fix-FF-A-version-in-SPMC-manifest.patch +3 -8
@@ -1,7 +1,4 @@ -Upstream-Status: Inappropriate -Signed-off-by: Emekcan Aras <[email protected]> - -From a31aee0988ef64724ec5866f10709f51f8cb3237 Mon Sep 17 00:00:00 2001 +From adaa22bc2f529bb34e9d4fe89ff5c65f0c83ca0c Mon Sep 17 00:00:00 2001 From: emeara01 <[email protected]> Date: Wed, 11 May 2022 14:37:06 +0100 Subject: [PATCH] Fix FF-A version in SPMC manifest
@@ -11,13 +8,14 @@ This commit corrects the FF-A version in corstone1000_spmc_manifest.dts. This patch will not be upstreamed and will be dropped once OPTEE version is updated for Corstone1000. +Upstream-Status: Inappropriate Signed-off-by: Emekcan Aras <[email protected]> --- .../corstone1000/common/fdts/corstone1000_spmc_manifest.dts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plat/arm/board/corstone1000/common/fdts/corstone1000_spmc_manifest.dts b/plat/arm/board/corstone1000/common/fdts/corstone1000_spmc_manifest.dts -index 8e49ab83f..5baa1b115 100644 +index 8e49ab83f76a..5baa1b115b2e 100644 --- a/plat/arm/board/corstone1000/common/fdts/corstone1000_spmc_manifest.dts +++ b/plat/arm/board/corstone1000/common/fdts/corstone1000_spmc_manifest.dts @@ -20,7 +20,7 @@
@@ -29,6 +27,3 @@ index 8e49ab83f..5baa1b115 100644 exec_state = <0x0>; load_address = <0x0 0x2002000>; entrypoint = <0x0 0x2002000>; --- -2.17.1 -
meta-arm-bsp/recipes-bsp/trusted-firmware-a/files/corstone1000/0002-feat-corstone1000-bl2-loads-fip-based-on-metadata.patch +10 -14
@@ -1,4 +1,4 @@ -From 360aa32846a97e775750e06865d462c6258179fa Mon Sep 17 00:00:00 2001 +From fa7ab9b40babee29d2aadb267dfce7a96f8989d4 Mon Sep 17 00:00:00 2001 From: Mohamed Omar Asaker <[email protected]> Date: Mon, 9 Jan 2023 13:59:06 +0000 Subject: [PATCH] feat(corstone1000): bl2 loads fip based on metadata
@@ -15,7 +15,6 @@ image starts at fip partition + fip signature area size. Upstream-Status: Pending Signed-off-by: Mohamed Omar Asaker <[email protected]> - --- bl2/bl2_main.c | 4 +++ .../corstone1000/common/corstone1000_plat.c | 32 ++++++-------------
@@ -25,10 +24,10 @@ Signed-off-by: Mohamed Omar Asaker <[email protected]> 5 files changed, 24 insertions(+), 32 deletions(-) diff --git a/bl2/bl2_main.c b/bl2/bl2_main.c -index 5da803795..f25dc3029 100644 +index ce83692e0ebc..1a9febc007b2 100644 --- a/bl2/bl2_main.c +++ b/bl2/bl2_main.c -@@ -86,6 +86,10 @@ void bl2_main(void) +@@ -87,6 +87,10 @@ void bl2_main(void) /* Perform remaining generic architectural setup in S-EL1 */ bl2_arch_setup();
@@ -40,7 +39,7 @@ index 5da803795..f25dc3029 100644 fwu_init(); #endif /* PSA_FWU_SUPPORT */ diff --git a/plat/arm/board/corstone1000/common/corstone1000_plat.c b/plat/arm/board/corstone1000/common/corstone1000_plat.c -index 0235f8b84..7f9708a82 100644 +index 0235f8b8474c..7f9708a82489 100644 --- a/plat/arm/board/corstone1000/common/corstone1000_plat.c +++ b/plat/arm/board/corstone1000/common/corstone1000_plat.c @@ -33,36 +33,17 @@ const mmap_region_t plat_arm_mmap[] = {
@@ -98,7 +97,7 @@ index 0235f8b84..7f9708a82 100644 * is no power control present */ diff --git a/plat/arm/board/corstone1000/common/include/platform_def.h b/plat/arm/board/corstone1000/common/include/platform_def.h -index 584d485f3..0bfab05a4 100644 +index 584d485f3ea7..0bfab05a482b 100644 --- a/plat/arm/board/corstone1000/common/include/platform_def.h +++ b/plat/arm/board/corstone1000/common/include/platform_def.h @@ -173,16 +173,16 @@
@@ -125,10 +124,10 @@ index 584d485f3..0bfab05a4 100644 /* * Some data must be aligned on the biggest cache line size in the platform. diff --git a/tools/cert_create/Makefile b/tools/cert_create/Makefile -index ca548b836..32b5486a0 100644 +index 042e844626bd..45b76a022f91 100644 --- a/tools/cert_create/Makefile +++ b/tools/cert_create/Makefile -@@ -69,8 +69,8 @@ INC_DIR += -I ./include -I ${PLAT_INCLUDE} -I ${OPENSSL_DIR}/include +@@ -78,8 +78,8 @@ INC_DIR += -I ./include -I ${PLAT_INCLUDE} -I ${OPENSSL_DIR}/include # directory. However, for a local build of OpenSSL, the built binaries are # located under the main project directory (i.e.: ${OPENSSL_DIR}, not # ${OPENSSL_DIR}/lib/).
@@ -140,10 +139,10 @@ index ca548b836..32b5486a0 100644 HOSTCC ?= gcc diff --git a/tools/fiptool/Makefile b/tools/fiptool/Makefile -index e6aeba95b..7c047479e 100644 +index 2ebee33931ba..dcfd314bee89 100644 --- a/tools/fiptool/Makefile +++ b/tools/fiptool/Makefile -@@ -29,7 +29,7 @@ endif +@@ -39,7 +39,7 @@ HOSTCCFLAGS += -DUSING_OPENSSL3=$(USING_OPENSSL3) # directory. However, for a local build of OpenSSL, the built binaries are # located under the main project directory (i.e.: ${OPENSSL_DIR}, not # ${OPENSSL_DIR}/lib/).
@@ -152,7 +151,7 @@ index e6aeba95b..7c047479e 100644 ifeq (${V},0) Q := @ -@@ -37,7 +37,7 @@ else +@@ -47,7 +47,7 @@ else Q := endif
@@ -161,6 +160,3 @@ index e6aeba95b..7c047479e 100644 HOSTCC ?= gcc --- -2.25.1 -
meta-arm-bsp/recipes-bsp/trusted-firmware-a/files/feat-qemu-update-abi-between-spmd-and-spmc.patch renamed from meta-arm/recipes-bsp/trusted-firmware-a/files/feat-qemu-update-abi-between-spmd-and-spmc.patch +0 -0
meta-arm-bsp/recipes-bsp/trusted-firmware-a/files/rwx-segments.patch renamed from meta-arm/recipes-bsp/trusted-firmware-a/files/rwx-segments.patch +0 -0
meta-arm-bsp/recipes-bsp/trusted-firmware-a/files/tf-a-tests-no-warn-rwx-segments.patch renamed from meta-arm/recipes-bsp/trusted-firmware-a/files/tf-a-tests-no-warn-rwx-segments.patch +0 -0
meta-arm-bsp/recipes-bsp/trusted-firmware-a/fiptool-native_2.8.6.bb renamed from meta-arm/recipes-bsp/trusted-firmware-a/fiptool-native_2.8.6.bb +0 -0
meta-arm-bsp/recipes-bsp/trusted-firmware-a/tf-a-tests_%.bbappend renamed from meta-arm-bsp/recipes-bsp/trusted-firmware-a/tf-a-tests_2.8.0.bbappend +0 -0
meta-arm-bsp/recipes-bsp/trusted-firmware-a/tf-a-tests_2.8.0.bb renamed from meta-arm/recipes-bsp/trusted-firmware-a/tf-a-tests_2.8.0.bb +0 -0
meta-arm-bsp/recipes-bsp/trusted-firmware-a/trusted-firmware-a-corstone1000.inc +4 -5
@@ -3,12 +3,11 @@ COMPATIBLE_MACHINE = "(corstone1000)" FILESEXTRAPATHS:prepend := "${THISDIR}/files/corstone1000:" - -SRC_URI:append = " \ +SRC_URI:append = " \ file://0001-Fix-FF-A-version-in-SPMC-manifest.patch \ - file://0002-feat-corstone1000-bl2-loads-fip-based-on-metadata.patch \ - file://0003-psci-SMCCC_ARCH_FEATURES-discovery-through-PSCI_FEATURES.patch \ - " + file://0002-feat-corstone1000-bl2-loads-fip-based-on-metadata.patch \ + file://0003-psci-SMCCC_ARCH_FEATURES-discovery-through-PSCI_FEATURES.patch \ + " #Sets TF-A version to 2.8.0 SRCREV_tfa = "9881bb93a3bc0a3ea37e9f093e09ab4b360a9e48"
meta-arm-bsp/recipes-bsp/trusted-firmware-a/trusted-firmware-a_%.bbappend renamed from meta-arm-bsp/recipes-bsp/trusted-firmware-a/trusted-firmware-a_2.8.%.bbappend +0 -0
meta-arm-bsp/recipes-bsp/trusted-firmware-a/trusted-firmware-a_2.8.6.bb renamed from meta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware-a_2.8.6.bb +1 -1
@@ -1,4 +1,4 @@ -require trusted-firmware-a.inc +require recipes-bsp/trusted-firmware-a/trusted-firmware-a.inc # TF-A v2.8.6 SRCREV_tfa = "ff0bd5f9bb2ba2f31fb9cec96df917747af9e92d"
meta-arm/recipes-bsp/trusted-firmware-a/files/0001-Add-spmc_manifest-for-qemu.patch new file +64 -0
64 lines not on this page · raw message
meta-arm/recipes-bsp/trusted-firmware-a/fiptool-native_2.9.0.bb new file +33 -0
@@ -0,0 +1,33 @@ +# Firmware Image Package (FIP) +# It is a packaging format used by TF-A to package the +# firmware images in a single binary. + +DESCRIPTION = "fiptool - Trusted Firmware tool for packaging" +LICENSE = "BSD-3-Clause" + +SRC_URI_TRUSTED_FIRMWARE_A ?= "git://git.trustedfirmware.org/TF-A/trusted-firmware-a.git;protocol=https" +SRC_URI = "${SRC_URI_TRUSTED_FIRMWARE_A};destsuffix=fiptool-${PV};branch=${SRCBRANCH}" +LIC_FILES_CHKSUM = "file://docs/license.rst;md5=b2c740efedc159745b9b31f88ff03dde" + +# Use fiptool from TF-A v2.9.0 +SRCREV = "d3e71ead6ea5bc3555ac90a446efec84ef6c6122" +SRCBRANCH = "master" + +DEPENDS += "openssl-native" + +inherit native + +EXTRA_OEMAKE = "V=1 HOSTCC='${BUILD_CC}' OPENSSL_DIR=${STAGING_DIR_NATIVE}/${prefix_native}" + +do_compile () { + # This is still needed to have the native fiptool executing properly by + # setting the RPATH + sed -i '/^LDLIBS/ s,$, \$\{BUILD_LDFLAGS},' ${S}/tools/fiptool/Makefile + sed -i '/^INCLUDE_PATHS/ s,$, \$\{BUILD_CFLAGS},' ${S}/tools/fiptool/Makefile + + oe_runmake fiptool +} + +do_install () { + install -D -p -m 0755 tools/fiptool/fiptool ${D}${bindir}/fiptool +}
meta-arm/recipes-bsp/trusted-firmware-a/tf-a-tests_2.9.0.bb new file +54 -0
54 lines not on this page · raw message
meta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware-a_2.9.0.bb new file +17 -0
@@ -0,0 +1,17 @@ +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" + +# mbed TLS v2.28.4 +SRC_URI_MBEDTLS = "git://github.com/ARMmbed/mbedtls.git;name=mbedtls;protocol=https;destsuffix=git/mbedtls;branch=mbedtls-2.28" +SRCREV_mbedtls = "aeb97a18913a86f051afab11b2c92c6be0c2eb83" + +LIC_FILES_CHKSUM_MBEDTLS = "file://mbedtls/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57"
Signature · 1 line
2.30.2
Jon Mason
AppliedQuoted 4 lines · Jon Mason
Update the trusted-firmware-a recipes to 2.9.0
Moving legacy recipes (2.8) for tc1 and corestone1000 to meta-arm-bsp
Applied, thanks!
[1/1] arm/trusted-firmware-a: update to 2.9.0
commit: 391b9dc0a933643459e2657ee4ccc071d25071bd
Best regards,
Signature · 1 line
Jon Mason <[email protected]>