arm/trusted-firmware-a: add support for 2.11.0
PATCH 1/6 arm/trusted-firmware-a: add support for 2.11.0
Add support for tf-a version v2.11.0 and mbedtls 3.6.0. Modifications to the license checksum were necessary due to the addition to that file for DICE (which is Apache 2.0 licensed) for TF-A and the dual license of mbedtls (Apache 2.0 and addition of GPLv2).
NOTE: FVP base is having (more of) an issue with CI on the newest TF-A, with SSH tests timing out. Holding that back to the LTS version until it cane be resolved.
--- meta-arm-bsp/conf/machine/fvp-base.conf | 3 +- .../fiptool-native_2.11.0.bb | 33 +++++++++++ .../trusted-firmware-a/tf-a-tests_2.11.0.bb | 58 +++++++++++++++++++ .../trusted-firmware-a_2.11.0.bb | 19 ++++++ 4 files changed, 112 insertions(+), 1 deletion(-) create mode 100644 meta-arm/recipes-bsp/trusted-firmware-a/fiptool-native_2.11.0.bb create mode 100644 meta-arm/recipes-bsp/trusted-firmware-a/tf-a-tests_2.11.0.bb create mode 100644 meta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware-a_2.11.0.bb
meta-arm-bsp/conf/machine/fvp-base.conf +2 -1
@@ -9,6 +9,7 @@ require conf/machine/include/arm/arch-armv8-4a.inc ARM_SYSTEMREADY_FIRMWARE = "trusted-firmware-a:do_deploy" ARM_SYSTEMREADY_ACS_CONSOLE = "default" EXTRA_IMAGEDEPENDS = "${ARM_SYSTEMREADY_FIRMWARE}" +PREFERRED_VERSION_trusted-firmware-a ?= "2.10.%" MACHINE_FEATURES = "efi"
@@ -62,4 +63,4 @@ FVP_TERMINALS[bp.terminal_0] ?= "Console" FVP_TERMINALS[bp.terminal_1] ?= "" FVP_TERMINALS[bp.terminal_2] ?= "" FVP_TERMINALS[bp.terminal_3] ?= "" -FVP_CONFIG[bp.secure_memory] ?= "1" +FVP_CONFIG[bp.secure_memory] ?= "1"
meta-arm/recipes-bsp/trusted-firmware-a/fiptool-native_2.11.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=b5fbfdeb6855162dded31fadcd5d4dc5" + +# Use fiptool from TF-A v2.11.0 +SRCREV = "f2735ebccf5173f74c0458736ec526276106097e" +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 '/^LDOPTS/ 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.11.0.bb new file +58 -0
58 lines not on this page · raw message
meta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware-a_2.11.0.bb new file +19 -0
@@ -0,0 +1,19 @@ +require recipes-bsp/trusted-firmware-a/trusted-firmware-a.inc + +# TF-A v2.11.0 +SRCREV_tfa = "f2735ebccf5173f74c0458736ec526276106097e" +SRCBRANCH = "master" + +LIC_FILES_CHKSUM += "file://docs/license.rst;md5=b5fbfdeb6855162dded31fadcd5d4dc5" + +# in TF-A src, docs/getting_started/prerequisites.rst lists the expected version mbedtls +# mbedtls-3.6.0 +SRC_URI_MBEDTLS = "git://github.com/ARMmbed/mbedtls.git;name=mbedtls;protocol=https;destsuffix=git/mbedtls;branch=master" +SRCREV_mbedtls = "2ca6c285a0dd3f33982dd57299012dacab1ff206" + +LIC_FILES_CHKSUM_MBEDTLS = "file://mbedtls/LICENSE;md5=379d5819937a6c2f1ef1630d341e026d" + +# continue to boot also without TPM +SRC_URI += "\ + file://0001-qemu_measured_boot.c-ignore-TPM-error-and-continue-w.patch \ +"
Signature · 1 line
2.39.3 (Apple Git-146)
PATCH 2/6 arm/hafnium: update to v2.11
Update hafnium to the latest version
Changes in hafnium between 946fde92bedc95e1320684b0bc2dc752bc1e1bc7 and 2bef7ab3895c48d39b84ab58179b2d0de5156b8b 2bef7ab3895c docs: the change log for the v2.11 release2aea748eb344 docs: add SIMD support sectiondac0ae1bf74a docs: threat model GPF with memory share9dbe17a3fc60 docs: threat model to NWd rxtx buffer0b45a2e28f65 docs: fix FFA_CONSOLE_LOG descriptionc28ee3eda25d docs: device regions in SPMC manifestd547d6df4228 docs(memory management): rme integration963a5d73abb5 docs: document FFA_FEATURESd40979fd9974 docs: document FFA_CONSOLE_LOG ABIdfc312e2a965 docs: add description of device memory lendingce8526ecac0f docs: update threat model for static dma isolation17c9ad327bfa fix(ff-a): report NPI and MEI unsupported to normal world27a4df506d83 refactor(simd): cosmetic rename sm local variable4695ce892967 fix(simd): fix SME-only save/restore conditions4fd8f364ff43 fix(simd): omit setting SVE VL in SIMD restore034a31970f4e fix(simd): cosmetic comments79dbd6f9ab99 fix(simd): mask out SMCCC SVE hint bit96ffeee3175b fix(simd): use SMCCC SVE hint bit maskca92fb0d303a refactor(simd): FPU save/restore convert to C42a5262ebd4a fix: SVE/SME unsupported in processor feature regs731f40b91e39 fix(test): reorder log before sync call in echo_mp9b579d365a2d chore: remove extra lines from echo_mp test log8a5fd9d9163a feat(indirect message): use 'memcpy_trapped'0a21db13d12d feat(ff-a): use memcpy that is trapped GPFa2d1c3b9c94a feat: add implementation of memcpy_trapped7388c18ef222 refactor: exception handling macros for reuse at EL2568f2a7b8fb9 feat(aarch64): define macros to process GPF462ad8d90796 chore(hftest): use common secondary stack definition491ff30f1ac4 test(dir_msg): demo MP test with direct message0c029c2719cd feat: prepare for MP testsb186fecfdf78 feat: added macro SERVICE_SELECT_MP592ede3c7b95 test(memory share): NWd to SWd device memory sharing63af1fab1656 feat(memory share): enable NWd to SWd device memory lending4339edcf0bb0 feat(memory share): validate sp device mem ranges6dff8271fbdc test(memory share): check limits on device mem sharinga4de8a56b211 test(memory share): device lend SP to SPa56ec8eff0f5 refactor(memory share): attributes in test helpers9764ff6bd861 feat(memory share): allow device memory lend SP to SP941ef34e5741 test(manifest): device memory for overlaps4d16572b89ac feat(manifest): check device memory region for overlap163e1a95a253 fix: ensure device regions are mapped as nGnRnE899c4f28ab00 docs: drop unnecessary build option03ba75fe13c3 refactor: set vcpu of the NWd in preempted state0247fe68743e refactor: use vcpu_set_running function874737a43d64 docs: mte build option in TF-A integration2d570d1ef339 ci: increasing timeout6976541fcc9e fix: update docs to use correct MTE build flagb1dbca99bae7 docs: update docs with new RXTX_MAP/UNMAP behavior738bee137e1d feat(ff-a): validate FFA_RXTX_MAP/UNMAP against NWd page tables41e8d5b1f805 refactor: set vcpu in preempted statee143080baf9b feat: add vm_lock_both_in_order587cd29b5d3a test: FFA_CONSOLE_LOG with extended registers740f74fc95c6 feat: support extended register set for FFA_CONSOLE_LOGb9705e2bd383 fix(ff-a): check that hypervisor's TX buffer is set-up95f0e6033ad9 fix: fix typo in static_assertf98b2aa1d407 feat: add helpers for names of various enums84710f315ae7 refactor(ff-a): use bitfields for memory access bitmaps2fc6dcfa97e0 feat: update BL31 binary to optimize NS context management5386559b386a feat: save and restore non-secure peripheral registers80a7b7fe9abe feat: save and restore non-secure MTE context0ec38247a973 feat: save and restore non-secure system reg contextc70bacdd5054 refactor: create helpers to save and restore sys reg context3956b2e6074a fix(direct message): tests to look for FFA_BUSY7ea3f7ec8cb9 fix(direct message): reorder checks for FFA_BUSYe5262378c5d7 fix(memory share): missing flag if permissions ROc972cc6de311 fix(memory share): data access permissions7de61af932d1 fix(memory share): sender and receiver are the samef779fb7ed4eb fix: ffa_msg_wait shall not change the mailbox statedc8cf3b899e6 test(ff-a): NPI not supported on EL0 partitionf1ed5f16cd59 fix(ff-a): report NPI unsupported on EL0 partition76f1c8f03c27 test(ff-a): SRI is unsupported on secure worldcb6642c1cd6a fix(ff-a): report SRI unsupported to secure partitionsf7861301c512 test(ff-a): FFA_FEATURES returns max RXTX buffer size0fd672906e61 feat(ff-a): report RXTX buffer size in FFA_FEATURESf2b6fd1e8e7d test(ff-a): fix counts for ffa_info_get with multiple uuidsa1de3c5f69f6 feat(ff-a): add multiple uuids to partition info desc3bbed8f554d2 fix: allow code coverage tests to run despite fails6e3abcff0f1b docs: add FFA_MSG_SEND_DIRECT_REQ2/RESP2 support364400e8d91b refactor: linux driver statically allocate vmse0ca9a07de7b refactor(memory share): introduce ffa_memory_access_impdef_initf1dd1e1375a8 fix: partition message total size check37b75119ed18 fix: partition message offset check0abd88768e9a test: FFA_MSG_SEND_DIRECT_RESP2 intercepted4847e3bdd837 test(dir_msg): cyclic dependency with two ABIs9375a292b992 test(smccc): test register integrity across FF-A versionsbed1dae8b4c1 test(dir_msg): extend multiple uuids testf06b52366f40 fix(mem sharing): return error if receiver count is 05e425040abf4 test(memory share): multiple borrowers from v1.1 SPa76fd9165b4b fix(memory share): broken assert in send from SP to multipled50411214cb8 docs: update memory sharing to reflect recent changes607c724cbda3 chore: increase timeout for sp_route_interrupt_to_secondary_vcpu106c8cec1662 fix: reduce verbosity on passing tf-a-tests9ae48e998450 test: intercept direct response between two SPsca2f92d3adf1 test: enable specifying options for sp_fwd_sleep command0a704e559d7e fix: unwind call chain after intercepting direct response5a0991746afa fix: error return in FFA_MEM_PERM_GET/SETf06ee9df186d fix(memory share): drop assertion sender ID89c221317513 fix: per-vCPU/global bind/set mismatch30ac91dc9c78 fix: global notifications shall use vCPU ID 06b754a188dca fix: flags that mbz are checkedf020814b4105 chore: improve log message in notification set7333dcfaf21a fix: notification set error code1512acc0a69c chore: print bitmap on FFA_NOTIFICATION_BIND7ccaccf2ab18 fix: invalid ID in bitmap create/destroy2a500071f224 fix: spmc test script didn't capture failures37e559da0f07 refactor(tc): remap console logsa3905006b590 test(dir_msg): add FF-A version based tests382e0c622a79 test(ff-a): registers preserved after dir_resp352388760d18 feat(ff-a): preserve extended registers in dir_resp81237694db4d test: exercise interrupt handling while processing indirect message8922671489d9 test: support for services to parse device regions93978b038e4d test: add twdog helpers to primary_with_secondaries9a1b9c0bff6b test: make sp805 driver common across test setupsba2488560be8 fix(interrupts): intercept ffa_msg_wait to signal virtual interruptba22a72b8866 refactor: add helpers to intercept and resume ffa calls7182163a2245 docs: update ff-a bindings for static dma isolation555f8882f437 docs: add support for static dma isolation7c7b1a7764ef feat: demonstrate specifying dma device count per partition0715f32ba515 feat(smmuv3): restrict access of streams to limited memory regions0e57d3d35892 feat(iommu): map memory regions into dma page tables070f49ebfb4a feat: initialize page tables for enforcing dma isolation8a3644777dc1 feat: allow platforms to specify dma device count per partitione032af5e6a37 feat: track dma devices and map to stream ids3c2b7911e6ee feat: retrieve dma properties for each memory region node1ced4cb719ff feat(sme): add NS SME save/restore operationsffdeb23a067b feat(sme): introduce an SME module52bbdee7487c feat(sme): add SME related definitions5b5883351c94 feat(simd): SIMD NS save/restore convert to Cdc112d50c258 refactor: make is_arch_feat_sve_supported inlinedd71c83aa8f44 feat(sve): introduce an SVE moduleb0faf45a6c4a fix: ensure SVE traps are enabled when running SPs063ad835b5bd feat(memory share): revert protect actionfd2060536fee feat(memory share): unprotect memory on reclaim460d36c1fc58 feat(memory share): protect on memory lend/donatecf6253e3abec feat(memory share): protect/unprotect memorya2ff04126675 feat(rme): add protect/unprotect memory functions0a83dc2bf94c feat(memory share): define ffa_map_actionsdad6003e1fcd feat: add build options for memory protectcb4dc90811b6 feat: arch helpers to check RME support2e14ebe8b6e3 fix(memory share): fix behaviour of relinquish clear flag3d0a462034c0 ci: separate static checks in a script674e4de6bb3a refactor: mailbox doesn't need size and sender44e9b3b7bebb fix(memory share): hypervisor retrieve request7b6ab6195d84 fix(memory share): set size of access descriptor4f0d9c1843cf refactor(memory share): split memory retrieve reqd61246b6c5e1 fix(ff-a): do not report FFA_EL3_INTR_HANDLE to VM40d09d2ce60c docs: added section for building a single platformf90f1f12de0a feat(build): check platforms exist before building41ef8baba363 refactor(memory share): use receiver_offsets to find receiver array39bc21b07309 test(dir_msg): test direct message abi pairse468c1168124 fix(dir_msg): enforce direct message ABI pairscf7cc68012d3 test(ff-a): add FF-A v1.2 ffa_features test58fe07d70fea test(dir_msg): end-to-end direct msg test with multiple uuids422b10bc6991 feat(uuids): add support for multiple UUIDs per partition036cc592731b test(ff-a v1.2): ffa_run to zero extended registers434bea9652a1 test(dir_msg): add tests for FFA_MSG_SEND_DIRECT_REQ2de0b0da535a1 test(dir_msg): extend registers in dir_msg tests087e50241881 feat(dir_msg): add FFA_MSG_SEND_DIRECT_RESP2db6a08b7cc6c feat(dir_msg) extend FFA_MSG_SEND_DIRECT_REQ2 registers734ddc4e7cfb test(dir_msg) test FFA_MSG_SEND_DIRECT_REQ241fea93fe85b feat(dir msg): add FFA_MSG_SEND_DIRECT_REQ286d9fa741b86 feat(prebuilts): add SPMD support for ff-a v1.2 dir msgc0e7dc20f2a9 docs: update messaging method ff-a bindingf71dee4c7bab feat(manifest): support FF-A v1.2 direct messages9681574575c0 test(memory share): add test for FF-A v1.1 endpoints63130e572dbe refactor(memory share): correct names of versioned share tests909d3bbeca84 test(memory share): check memory access invalid values59ffee9ba6bd test(memory share): introduce impdef value checkde974ca9b936 feat(memory share): add impdef field to ffa_memory_accessc7dc932e9a15 feat(memory share): check memory region desc valuesd5ae44bed0c1 refactor(memory share): add helper for accessing receivers36e0bdbf58e6 refactor(memory share): make ffa_memory_region update common64400234fe31 refactor: make is_arch_feat_bti_supported inlined109c6d4c0e5b fix: restrict HF_INTERRUPT_INJECT to Hypervisor0926addea321 feat(amu): enable traps0a1a9f861e6d feat(ff-a): update el0 services to v1.278788f863ca5 fix: ignore spurious interrupt and resume preempted vcpuc5b20e7e0d6b chore: remove clang toolchain from prebuilts6b351bc82c92 feat: build multiple targets at oncefdd59f75403f refactor: remove plat_ffa_other_world_mem_retrive functioned7dee80b329 test: exercise interrupt handling with interrupts masked3aafcb620cf4 test: add helpers and extend command args to mask interrupts151c2e7f0bf3 fix(interrupts): intercept direct response to signal virtual interrupt 09e086a7dbcf fix(interrupts): reset implicit completion signale1562a1488c3 feat(rd): secure hafnium build for rdfremontcfg1 platforme4fe29698285 feat(ff-a): update FF-A version to v1.2ad7451b1faee feat(prebuilts): update TF-A prebuilt binary to FF-A v1.2ed508c80a039 chore: make function private to ffa_memoryb56aac880e08 fix: explicit boolean for share_state pointer639ddfc0193e fix(memory share): read-only memory can't clear memory41d4fef0f044 fix(memory share): error code in retrieve request03f08d3dc4b8 feat(gicv3): ensure implementation supports two security states
---
.../recipes-bsp/hafnium/{hafnium_2.10.bb => hafnium_2.11.bb} | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
rename meta-arm/recipes-bsp/hafnium/{hafnium_2.10.bb => hafnium_2.11.bb} (97%)meta-arm/recipes-bsp/hafnium/hafnium_2.11.bb renamed from meta-arm/recipes-bsp/hafnium/hafnium_2.10.bb +1 -1
@@ -18,7 +18,7 @@ SRC_URI = "gitsm://git.trustedfirmware.org/hafnium/hafnium.git;protocol=https;br file://0001-Use-pkg-config-native-to-find-the-libssl-headers.patch;patchdir=third_party/linux \ file://0001-work-around-visibility-issue.patch;patchdir=third_party/dtc \ " -SRCREV = "946fde92bedc95e1320684b0bc2dc752bc1e1bc7" +SRCREV = "2bef7ab3895c48d39b84ab58179b2d0de5156b8b" S = "${WORKDIR}/git" B = "${WORKDIR}/build"
Signature · 1 line
2.39.3 (Apple Git-146)
PATCH 3/6 arm/edk2: update to edk2-stable202405
In reply to Jon Mason---
...ls-native_202402.bb => edk2-basetools-native_202405.bb} | 2 +-
meta-arm/recipes-bsp/uefi/edk2-firmware_202402.bb | 7 -------
meta-arm/recipes-bsp/uefi/edk2-firmware_202405.bb | 7 +++++++
meta-arm/recipes-bsp/uefi/sbsa-acs_7.1.4.bb | 2 +-
4 files changed, 9 insertions(+), 9 deletions(-)
rename meta-arm/recipes-bsp/uefi/{edk2-basetools-native_202402.bb => edk2-basetools-native_202405.bb} (93%)
delete mode 100644 meta-arm/recipes-bsp/uefi/edk2-firmware_202402.bb
create mode 100644 meta-arm/recipes-bsp/uefi/edk2-firmware_202405.bbmeta-arm/recipes-bsp/uefi/edk2-basetools-native_202405.bb renamed from meta-arm/recipes-bsp/uefi/edk2-basetools-native_202402.bb +1 -1
@@ -10,7 +10,7 @@ LICENSE = "BSD-2-Clause-Patent" SRC_URI = "git://github.com/tianocore/edk2.git;branch=master;protocol=https" LIC_FILES_CHKSUM = "file://License.txt;md5=2b415520383f7964e96700ae12b4570a" -SRCREV = "edc6681206c1a8791981a2f911d2fb8b3d2f5768" +SRCREV = "3e722403cd16388a0e4044e705a2b34c841d76ca" UPSTREAM_CHECK_GITTAGREGEX = "^edk2-stable(?P<pver>\d+)$"
meta-arm/recipes-bsp/uefi/edk2-firmware_202402.bb deleted +0 -7
@@ -1,7 +0,0 @@ -SRCREV_edk2 ?= "edc6681206c1a8791981a2f911d2fb8b3d2f5768" -SRCREV_edk2-platforms ?= "07842635c80b64c4a979a652104ea1141ba5007a" - -# FIXME - clang is having issues with antlr -TOOLCHAIN:aarch64 = "gcc" - -require recipes-bsp/uefi/edk2-firmware.inc
meta-arm/recipes-bsp/uefi/edk2-firmware_202405.bb new file +7 -0
@@ -0,0 +1,7 @@ +SRCREV_edk2 ?= "3e722403cd16388a0e4044e705a2b34c841d76ca" +SRCREV_edk2-platforms ?= "59c686673992d7549c2b054773d5d1b5e739a88b" + +# FIXME - clang is having issues with antlr +TOOLCHAIN:aarch64 = "gcc" + +require recipes-bsp/uefi/edk2-firmware.inc
meta-arm/recipes-bsp/uefi/sbsa-acs_7.1.4.bb +1 -1
@@ -1,4 +1,4 @@ -require recipes-bsp/uefi/edk2-firmware_202402.bb +require recipes-bsp/uefi/edk2-firmware_202405.bb PROVIDES:remove = "virtual/bootloader" LICENSE += "& Apache-2.0"
Signature · 1 line
2.39.3 (Apple Git-146)
PATCH 4/6 arm/trusted-firmware-rmm: add UPSTREAM_CHECK and tweak recipe version
In reply to Jon MasonAdding UPSTREAM_CHECK_GITTAGREGEX to properly check the upstream version, and modify the recipe name to follow the version in the git tree.
---
...trusted-firmware-rmm_0.4.bb => trusted-firmware-rmm_0.4.0.bb} | 1 +
1 file changed, 1 insertion(+)
rename meta-arm/recipes-bsp/trusted-firmware-rmm/{trusted-firmware-rmm_0.4.bb => trusted-firmware-rmm_0.4.0.bb} (95%)meta-arm/recipes-bsp/trusted-firmware-rmm/trusted-firmware-rmm_0.4.0.bb renamed from meta-arm/recipes-bsp/trusted-firmware-rmm/trusted-firmware-rmm_0.4.bb +1 -0
@@ -7,6 +7,7 @@ SRC_URI = "gitsm://git.trustedfirmware.org/TF-RMM/tf-rmm.git;protocol=https;bran " SRCREV = "0a02656945d69757b0779192cebb9b41dd9037d1" +UPSTREAM_CHECK_GITTAGREGEX = "^tf-rmm-v(?P<pver>\d+(\.\d+)+)$" LIC_FILES_CHKSUM += "file://docs/about/license.rst;md5=1375c7c641558198ffe401c2a799d79b"
Signature · 1 line
2.39.3 (Apple Git-146)
PATCH 5/6 arm/trusted-firmware-rmm: update to 0.5.0
In reply to Jon Mason---
...tra-repositories-for-system-includes.patch | 56 -------------------
...0.4.0.bb => trusted-firmware-rmm_0.5.0.bb} | 3 +-
2 files changed, 1 insertion(+), 58 deletions(-)
delete mode 100644 meta-arm/recipes-bsp/trusted-firmware-rmm/files/0001-build-lib-Add-extra-repositories-for-system-includes.patch
rename meta-arm/recipes-bsp/trusted-firmware-rmm/{trusted-firmware-rmm_0.4.0.bb => trusted-firmware-rmm_0.5.0.bb} (90%)meta-arm/recipes-bsp/trusted-firmware-rmm/files/0001-build-lib-Add-extra-repositories-for-system-includes.patch deleted +0 -56
@@ -1,56 +0,0 @@ -From bc7dbac20a6674eb2834bd6176665f1a2ae42edc Mon Sep 17 00:00:00 2001 -From: Mathieu Poirier <[email protected]> -Date: Thu, 14 Mar 2024 14:59:30 -0600 -Subject: [PATCH] build(lib): Add extra repositories for system includes - -Toolchains such as aarch64-none-elf, aarch64-none-linux-gnu and -aarch64-linux-gnu include assert.h and limits.h in a directory that is -part of their search path. This is not the case when compiling with -Yocto where aarch64-poky-linux places those files in the sysroot -directory of the component being compiled. - -Since the sysroot directory of the component is not part of the cmake -search path, compiling the RMM in Yocto fails. This patch fixes the -problem by expanding the search path when needed, allowing the RMM to be -compiled in Yocto. - -Upstream-Status: Backport [bc7dbac20a6674eb2834bd6176665f1a2ae42edc] -Signed-off-by: Mathieu Poirier <[email protected]> ---- - lib/arch/CMakeLists.txt | 3 +++ - lib/libc/CMakeLists.txt | 5 ++++- - 2 files changed, 7 insertions(+), 1 deletion(-) - -diff --git a/lib/arch/CMakeLists.txt b/lib/arch/CMakeLists.txt -index d3afc5f2bfc8..a52185f02695 100644 ---- a/lib/arch/CMakeLists.txt -+++ b/lib/arch/CMakeLists.txt -@@ -12,6 +12,9 @@ target_link_libraries(rmm-lib-arch - target_include_directories(rmm-lib-arch - PUBLIC "include" - "include/${RMM_ARCH}" -+ # The CMAKE_INCLUDE_PATH is included here for Yocto builds. the -+ # Yocto recipe will define this variable as part of the build. -+ ${CMAKE_INCLUDE_PATH} - PRIVATE "src/${RMM_ARCH}" - "src/include") - -diff --git a/lib/libc/CMakeLists.txt b/lib/libc/CMakeLists.txt -index 1631332dbc72..a2adf37f7cb8 100644 ---- a/lib/libc/CMakeLists.txt -+++ b/lib/libc/CMakeLists.txt -@@ -12,7 +12,10 @@ if(NOT RMM_ARCH STREQUAL fake_host) - rmm-lib-debug) - - target_include_directories(rmm-lib-libc SYSTEM -- PUBLIC "include") -+ PUBLIC "include" -+ # The CMAKE_INCLUDE_PATH is included here for Yocto builds. the -+ # Yocto recipe will define this variable as part of the build. -+ ${CMAKE_INCLUDE_PATH}) - - target_sources(rmm-lib-libc - PRIVATE "src/abort.c" --- -2.34.1 -
meta-arm/recipes-bsp/trusted-firmware-rmm/trusted-firmware-rmm_0.5.0.bb renamed from meta-arm/recipes-bsp/trusted-firmware-rmm/trusted-firmware-rmm_0.4.0.bb +1 -2
@@ -3,10 +3,9 @@ DESCRIPTION = "RMM Firmware for Arm reference platforms" LICENSE = "BSD-3-Clause & MIT" SRC_URI = "gitsm://git.trustedfirmware.org/TF-RMM/tf-rmm.git;protocol=https;branch=main \ - file://0001-build-lib-Add-extra-repositories-for-system-includes.patch \ " -SRCREV = "0a02656945d69757b0779192cebb9b41dd9037d1" +SRCREV = "6184a730bd4bc80d59eeff7f0752f8423500202c" UPSTREAM_CHECK_GITTAGREGEX = "^tf-rmm-v(?P<pver>\d+(\.\d+)+)$" LIC_FILES_CHKSUM += "file://docs/about/license.rst;md5=1375c7c641558198ffe401c2a799d79b"
Signature · 1 line
2.39.3 (Apple Git-146)
PATCH 6/6 arm/arm-tstee: add UPSTREAM_CHECK
In reply to Jon MasonAdd UPSTREAM_CHECK_GITTAGREGEX to allow devtool to check for the latest version
--- meta-arm/recipes-kernel/arm-tstee/arm-tstee_2.0.0.bb | 1 + 1 file changed, 1 insertion(+)
meta-arm/recipes-kernel/arm-tstee/arm-tstee_2.0.0.bb +1 -0
@@ -12,6 +12,7 @@ S = "${WORKDIR}/git" # Tag tee-v2.0.0 SRCREV = "a2d7349a96c3b3afb44bf1555d53f1c46e45a23d" +UPSTREAM_CHECK_GITTAGREGEX = "^tee-v(?P<pver>\d+(\.\d+)+)$" COMPATIBLE_HOST = "(arm|aarch64).*-linux" KERNEL_MODULE_AUTOLOAD += "arm-tstee"
Signature · 1 line
2.39.3 (Apple Git-146)
Quoted 4 lines · Jon Mason
Add support for tf-a version v2.11.0 and mbedtls 3.6.0. Modifications to the license checksum were necessary due to the addition to that file for DICE (which is Apache 2.0 licensed) for TF-A and the dual license of mbedtls (Apache 2.0 and addition of GPLv2).
In which case the LICENSE being set in the common .inc is incorrect:
LICENSE = "BSD-3-Clause & MIT"
And mbedtls conditionally adds Apache 2.0, but not GPLv2.
Quoted 165 lines
NOTE: FVP base is having (more of) an issue with CI on the newest TF-A, with SSH tests timing out. Holding that back to the LTS version until it cane be resolved.
Signed-off-by Jon Mason <[email protected]>--- meta-arm-bsp/conf/machine/fvp-base.conf | 3 +- .../fiptool-native_2.11.0.bb | 33 +++++++++++ .../trusted-firmware-a/tf-a-tests_2.11.0.bb | 58 +++++++++++++++++++ .../trusted-firmware-a_2.11.0.bb | 19 ++++++ 4 files changed, 112 insertions(+), 1 deletion(-) create mode 100644 meta-arm/recipes-bsp/trusted-firmware-a/fiptool-native_2.11.0.bb create mode 100644 meta-arm/recipes-bsp/trusted-firmware-a/tf-a-tests_2.11.0.bb create mode 100644 meta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware-a_2.11.0.bbmeta-arm-bsp/conf/machine/fvp-base.conf +2
-1@@ -9,6 +9,7 @@ require conf/machine/include/arm/arch-armv8-4a.inc ARM_SYSTEMREADY_FIRMWARE = "trusted-firmware-a:do_deploy" ARM_SYSTEMREADY_ACS_CONSOLE = "default" EXTRA_IMAGEDEPENDS = "${ARM_SYSTEMREADY_FIRMWARE}" +PREFERRED_VERSION_trusted-firmware-a ?= "2.10.%" MACHINE_FEATURES = "efi"@@ -62,4 +63,4 @@ FVP_TERMINALS[bp.terminal_0] ?= "Console" FVP_TERMINALS[bp.terminal_1] ?= "" FVP_TERMINALS[bp.terminal_2] ?= "" FVP_TERMINALS[bp.terminal_3] ?= "" -FVP_CONFIG[bp.secure_memory] ?= "1" +FVP_CONFIG[bp.secure_memory] ?= "1"meta-arm/recipes-bsp/trusted-firmware-a/fiptool-native_2.11.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=b5fbfdeb6855162dded31fadcd5d4dc5" + +# Use fiptool from TF-A v2.11.0 +SRCREV = "f2735ebccf5173f74c0458736ec526276106097e" +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 '/^LDOPTS/ 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.11.0.bb new file +58
-0@@ -0,0 +1,58 @@ +DESCRIPTION = "Trusted Firmware-A tests(aka TFTF)" +LICENSE = "BSD-3-Clause & NCSA" + +LIC_FILES_CHKSUM += "file://docs/license.rst;md5=6175cc0aa2e63b6d21a32aa0ee7d1b4a" + +inherit deploy + +COMPATIBLE_MACHINE ?= "invalid" + +SRC_URI_TRUSTED_FIRMWARE_A_TESTS ?= "git://git.trustedfirmware.org/TF-A/tf-a-tests.git;protocol=https" +SRC_URI = "${SRC_URI_TRUSTED_FIRMWARE_A_TESTS};branch=${SRCBRANCH} \ + " +SRCBRANCH = "master" +SRCREV = "fd053b75cde9c2aa1a5b979a2b544890510d4f52" + +DEPENDS += "optee-os" + +EXTRA_OEMAKE += "USE_NVM=0" +EXTRA_OEMAKE += "SHELL_COLOR=1" +EXTRA_OEMAKE += "DEBUG=1" + +# Modify mode based on debug or release mode +TFTF_MODE ?= "debug" + +# Platform must be set for each machine +TFA_PLATFORM ?= "invalid" + +EXTRA_OEMAKE += "ARCH=aarch64" +EXTRA_OEMAKE += "LOG_LEVEL=50" + +S = "${WORKDIR}/git" +B = "${WORKDIR}/build" + +# Add platform parameter +EXTRA_OEMAKE += "BUILD_BASE=${B} PLAT=${TFA_PLATFORM}" + +# Requires CROSS_COMPILE set by hand as there is no configure script +export CROSS_COMPILE="${TARGET_PREFIX}" + +LDFLAGS[unexport] = "1" +do_compile() { + oe_runmake -C ${S} tftf +} + +do_compile[cleandirs] = "${B}" + +FILES:${PN} = "/firmware/tftf.bin" +SYSROOT_DIRS += "/firmware" + +do_install() { + install -d -m 755 ${D}/firmware + install -m 0644 ${B}/${TFA_PLATFORM}/${TFTF_MODE}/tftf.bin ${D}/firmware/tftf.bin +} + +do_deploy() { + cp -rf ${D}/firmware/* ${DEPLOYDIR}/ +} +addtask deploy after do_installmeta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware-a_2.11.0.bb new file +19
-0@@ -0,0 +1,19 @@ +require recipes-bsp/trusted-firmware-a/trusted-firmware-a.inc + +# TF-A v2.11.0 +SRCREV_tfa = "f2735ebccf5173f74c0458736ec526276106097e" +SRCBRANCH = "master" + +LIC_FILES_CHKSUM += "file://docs/license.rst;md5=b5fbfdeb6855162dded31fadcd5d4dc5" + +# in TF-A src, docs/getting_started/prerequisites.rst lists the expected version mbedtls +# mbedtls-3.6.0 +SRC_URI_MBEDTLS = "git://github.com/ARMmbed/mbedtls.git;name=mbedtls;protocol=https;destsuffix=git/mbedtls;branch=master" +SRCREV_mbedtls = "2ca6c285a0dd3f33982dd57299012dacab1ff206" + +LIC_FILES_CHKSUM_MBEDTLS = "file://mbedtls/LICENSE;md5=379d5819937a6c2f1ef1630d341e026d" + +# continue to boot also without TPM +SRC_URI += "\ + file://0001-qemu_measured_boot.c-ignore-TPM-error-and-continue-w.patch \ +"Signature · 1 line
2.39.3 (Apple Git-146)
Quoted 11 lines · Denys Dmytriyenko
Quoted 4 lines · Jon Mason
Add support for tf-a version v2.11.0 and mbedtls 3.6.0. Modifications to the license checksum were necessary due to the addition to that file for DICE (which is Apache 2.0 licensed) for TF-A and the dual license of mbedtls (Apache 2.0 and addition of GPLv2).
In which case the LICENSE being set in the common .inc is incorrect:
LICENSE = "BSD-3-Clause & MIT"
And mbedtls conditionally adds Apache 2.0, but not GPLv2.
Per TF-A file docs/license.rst:
BSD-3-Clause for tf-a
and contains code for other projects with the following (simplified per the comments in that file):
libc has BSD-3-Clause
libfdt has BSD-2-Clause
LLVM has BSD-3-Clause
zlib has BSD-3-Clause
STMicroelectronics platform source code has BSD-3-Clause Linux source has MIT
DICE has Apache 2.0
So, tf-a should probably be:
LICENSE = "BSD-2-Clause & BSD-3-Clause & MIT & Apache-2.0"
mbedtls is Apache 2.0, as you said above...but not seeing where it is list as GPL in a LICENSE entry
I'll do a patch to make the above tweak to the tf-a inc file.
Thanks,
Jon
Quoted 166 lines
Quoted 165 lines
NOTE: FVP base is having (more of) an issue with CI on the newest TF-A, with SSH tests timing out. Holding that back to the LTS version until it cane be resolved.
Signed-off-by Jon Mason <[email protected]>--- meta-arm-bsp/conf/machine/fvp-base.conf | 3 +- .../fiptool-native_2.11.0.bb | 33 +++++++++++ .../trusted-firmware-a/tf-a-tests_2.11.0.bb | 58 +++++++++++++++++++ .../trusted-firmware-a_2.11.0.bb | 19 ++++++ 4 files changed, 112 insertions(+), 1 deletion(-) create mode 100644 meta-arm/recipes-bsp/trusted-firmware-a/fiptool-native_2.11.0.bb create mode 100644 meta-arm/recipes-bsp/trusted-firmware-a/tf-a-tests_2.11.0.bb create mode 100644 meta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware-a_2.11.0.bbmeta-arm-bsp/conf/machine/fvp-base.conf +2
-1@@ -9,6 +9,7 @@ require conf/machine/include/arm/arch-armv8-4a.inc ARM_SYSTEMREADY_FIRMWARE = "trusted-firmware-a:do_deploy" ARM_SYSTEMREADY_ACS_CONSOLE = "default" EXTRA_IMAGEDEPENDS = "${ARM_SYSTEMREADY_FIRMWARE}" +PREFERRED_VERSION_trusted-firmware-a ?= "2.10.%" MACHINE_FEATURES = "efi"@@ -62,4 +63,4 @@ FVP_TERMINALS[bp.terminal_0] ?= "Console" FVP_TERMINALS[bp.terminal_1] ?= "" FVP_TERMINALS[bp.terminal_2] ?= "" FVP_TERMINALS[bp.terminal_3] ?= "" -FVP_CONFIG[bp.secure_memory] ?= "1" +FVP_CONFIG[bp.secure_memory] ?= "1"meta-arm/recipes-bsp/trusted-firmware-a/fiptool-native_2.11.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=b5fbfdeb6855162dded31fadcd5d4dc5" + +# Use fiptool from TF-A v2.11.0 +SRCREV = "f2735ebccf5173f74c0458736ec526276106097e" +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 '/^LDOPTS/ 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.11.0.bb new file +58
-0@@ -0,0 +1,58 @@ +DESCRIPTION = "Trusted Firmware-A tests(aka TFTF)" +LICENSE = "BSD-3-Clause & NCSA" + +LIC_FILES_CHKSUM += "file://docs/license.rst;md5=6175cc0aa2e63b6d21a32aa0ee7d1b4a" + +inherit deploy + +COMPATIBLE_MACHINE ?= "invalid" + +SRC_URI_TRUSTED_FIRMWARE_A_TESTS ?= "git://git.trustedfirmware.org/TF-A/tf-a-tests.git;protocol=https" +SRC_URI = "${SRC_URI_TRUSTED_FIRMWARE_A_TESTS};branch=${SRCBRANCH} \ + " +SRCBRANCH = "master" +SRCREV = "fd053b75cde9c2aa1a5b979a2b544890510d4f52" + +DEPENDS += "optee-os" + +EXTRA_OEMAKE += "USE_NVM=0" +EXTRA_OEMAKE += "SHELL_COLOR=1" +EXTRA_OEMAKE += "DEBUG=1" + +# Modify mode based on debug or release mode +TFTF_MODE ?= "debug" + +# Platform must be set for each machine +TFA_PLATFORM ?= "invalid" + +EXTRA_OEMAKE += "ARCH=aarch64" +EXTRA_OEMAKE += "LOG_LEVEL=50" + +S = "${WORKDIR}/git" +B = "${WORKDIR}/build" + +# Add platform parameter +EXTRA_OEMAKE += "BUILD_BASE=${B} PLAT=${TFA_PLATFORM}" + +# Requires CROSS_COMPILE set by hand as there is no configure script +export CROSS_COMPILE="${TARGET_PREFIX}" + +LDFLAGS[unexport] = "1" +do_compile() { + oe_runmake -C ${S} tftf +} + +do_compile[cleandirs] = "${B}" + +FILES:${PN} = "/firmware/tftf.bin" +SYSROOT_DIRS += "/firmware" + +do_install() { + install -d -m 755 ${D}/firmware + install -m 0644 ${B}/${TFA_PLATFORM}/${TFTF_MODE}/tftf.bin ${D}/firmware/tftf.bin +} + +do_deploy() { + cp -rf ${D}/firmware/* ${DEPLOYDIR}/ +} +addtask deploy after do_installmeta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware-a_2.11.0.bb new file +19
-0@@ -0,0 +1,19 @@ +require recipes-bsp/trusted-firmware-a/trusted-firmware-a.inc + +# TF-A v2.11.0 +SRCREV_tfa = "f2735ebccf5173f74c0458736ec526276106097e" +SRCBRANCH = "master" + +LIC_FILES_CHKSUM += "file://docs/license.rst;md5=b5fbfdeb6855162dded31fadcd5d4dc5" + +# in TF-A src, docs/getting_started/prerequisites.rst lists the expected version mbedtls +# mbedtls-3.6.0 +SRC_URI_MBEDTLS = "git://github.com/ARMmbed/mbedtls.git;name=mbedtls;protocol=https;destsuffix=git/mbedtls;branch=master" +SRCREV_mbedtls = "2ca6c285a0dd3f33982dd57299012dacab1ff206" + +LIC_FILES_CHKSUM_MBEDTLS = "file://mbedtls/LICENSE;md5=379d5819937a6c2f1ef1630d341e026d" + +# continue to boot also without TPM +SRC_URI += "\ + file://0001-qemu_measured_boot.c-ignore-TPM-error-and-continue-w.patch \ +"Signature · 1 line
2.39.3 (Apple Git-146)
A message that is not in the archive (sent off-list or not yet received): [email protected]
Quoted 11 lines · Denys Dmytriyenko
Quoted 4 lines · Jon Mason
Add support for tf-a version v2.11.0 and mbedtls 3.6.0. Modifications to the license checksum were necessary due to the addition to that file for DICE (which is Apache 2.0 licensed) for TF-A and the dual license of mbedtls (Apache 2.0 and addition of GPLv2).
In which case the LICENSE being set in the common .inc is incorrect:
LICENSE = "BSD-3-Clause & MIT"
And mbedtls conditionally adds Apache 2.0, but not GPLv2.
Hi, Jon,
Any comments or concerns?
Quoted 165 lines
Quoted 165 lines
NOTE: FVP base is having (more of) an issue with CI on the newest TF-A, with SSH tests timing out. Holding that back to the LTS version until it cane be resolved.
Signed-off-by Jon Mason <[email protected]>--- meta-arm-bsp/conf/machine/fvp-base.conf | 3 +- .../fiptool-native_2.11.0.bb | 33 +++++++++++ .../trusted-firmware-a/tf-a-tests_2.11.0.bb | 58 +++++++++++++++++++ .../trusted-firmware-a_2.11.0.bb | 19 ++++++ 4 files changed, 112 insertions(+), 1 deletion(-) create mode 100644 meta-arm/recipes-bsp/trusted-firmware-a/fiptool-native_2.11.0.bb create mode 100644 meta-arm/recipes-bsp/trusted-firmware-a/tf-a-tests_2.11.0.bb create mode 100644 meta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware-a_2.11.0.bbmeta-arm-bsp/conf/machine/fvp-base.conf +2
-1@@ -9,6 +9,7 @@ require conf/machine/include/arm/arch-armv8-4a.inc ARM_SYSTEMREADY_FIRMWARE = "trusted-firmware-a:do_deploy" ARM_SYSTEMREADY_ACS_CONSOLE = "default" EXTRA_IMAGEDEPENDS = "${ARM_SYSTEMREADY_FIRMWARE}" +PREFERRED_VERSION_trusted-firmware-a ?= "2.10.%" MACHINE_FEATURES = "efi"@@ -62,4 +63,4 @@ FVP_TERMINALS[bp.terminal_0] ?= "Console" FVP_TERMINALS[bp.terminal_1] ?= "" FVP_TERMINALS[bp.terminal_2] ?= "" FVP_TERMINALS[bp.terminal_3] ?= "" -FVP_CONFIG[bp.secure_memory] ?= "1" +FVP_CONFIG[bp.secure_memory] ?= "1"meta-arm/recipes-bsp/trusted-firmware-a/fiptool-native_2.11.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=b5fbfdeb6855162dded31fadcd5d4dc5" + +# Use fiptool from TF-A v2.11.0 +SRCREV = "f2735ebccf5173f74c0458736ec526276106097e" +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 '/^LDOPTS/ 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.11.0.bb new file +58
-0@@ -0,0 +1,58 @@ +DESCRIPTION = "Trusted Firmware-A tests(aka TFTF)" +LICENSE = "BSD-3-Clause & NCSA" + +LIC_FILES_CHKSUM += "file://docs/license.rst;md5=6175cc0aa2e63b6d21a32aa0ee7d1b4a" + +inherit deploy + +COMPATIBLE_MACHINE ?= "invalid" + +SRC_URI_TRUSTED_FIRMWARE_A_TESTS ?= "git://git.trustedfirmware.org/TF-A/tf-a-tests.git;protocol=https" +SRC_URI = "${SRC_URI_TRUSTED_FIRMWARE_A_TESTS};branch=${SRCBRANCH} \ + " +SRCBRANCH = "master" +SRCREV = "fd053b75cde9c2aa1a5b979a2b544890510d4f52" + +DEPENDS += "optee-os" + +EXTRA_OEMAKE += "USE_NVM=0" +EXTRA_OEMAKE += "SHELL_COLOR=1" +EXTRA_OEMAKE += "DEBUG=1" + +# Modify mode based on debug or release mode +TFTF_MODE ?= "debug" + +# Platform must be set for each machine +TFA_PLATFORM ?= "invalid" + +EXTRA_OEMAKE += "ARCH=aarch64" +EXTRA_OEMAKE += "LOG_LEVEL=50" + +S = "${WORKDIR}/git" +B = "${WORKDIR}/build" + +# Add platform parameter +EXTRA_OEMAKE += "BUILD_BASE=${B} PLAT=${TFA_PLATFORM}" + +# Requires CROSS_COMPILE set by hand as there is no configure script +export CROSS_COMPILE="${TARGET_PREFIX}" + +LDFLAGS[unexport] = "1" +do_compile() { + oe_runmake -C ${S} tftf +} + +do_compile[cleandirs] = "${B}" + +FILES:${PN} = "/firmware/tftf.bin" +SYSROOT_DIRS += "/firmware" + +do_install() { + install -d -m 755 ${D}/firmware + install -m 0644 ${B}/${TFA_PLATFORM}/${TFTF_MODE}/tftf.bin ${D}/firmware/tftf.bin +} + +do_deploy() { + cp -rf ${D}/firmware/* ${DEPLOYDIR}/ +} +addtask deploy after do_installmeta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware-a_2.11.0.bb new file +19
-0@@ -0,0 +1,19 @@ +require recipes-bsp/trusted-firmware-a/trusted-firmware-a.inc + +# TF-A v2.11.0 +SRCREV_tfa = "f2735ebccf5173f74c0458736ec526276106097e" +SRCBRANCH = "master" + +LIC_FILES_CHKSUM += "file://docs/license.rst;md5=b5fbfdeb6855162dded31fadcd5d4dc5" + +# in TF-A src, docs/getting_started/prerequisites.rst lists the expected version mbedtls +# mbedtls-3.6.0 +SRC_URI_MBEDTLS = "git://github.com/ARMmbed/mbedtls.git;name=mbedtls;protocol=https;destsuffix=git/mbedtls;branch=master" +SRCREV_mbedtls = "2ca6c285a0dd3f33982dd57299012dacab1ff206" + +LIC_FILES_CHKSUM_MBEDTLS = "file://mbedtls/LICENSE;md5=379d5819937a6c2f1ef1630d341e026d" + +# continue to boot also without TPM +SRC_URI += "\ + file://0001-qemu_measured_boot.c-ignore-TPM-error-and-continue-w.patch \ +"Signature · 1 line
2.39.3 (Apple Git-146)