mirrors/meta-arm
1
0 Fork 0
mirror of https://git.yoctoproject.org/meta-arm synced 2026-10-15 17:27:09 +00:00
Code Issues Projects Releases Wiki Activity

optee-ftpm: rewrite its optee-os bbappend to use EARLY_TA_PATHS bitbake variable

Browse Source 
If anything else in the BSP also wants or needs to add an early TA to
optee, that will conflict with this .bbappend adding its own
EARLY_TA_PATHS="..." argument to EXTRA_OEMAKE.

Instead, add the path to the ftpm TA to the newly introduced
EARLY_TA_PATHS bitbake variable, which the main recipe will use to
produce the make argument.

Passing CFG_EARLY_TA=y explicitly is not needed, as optee-os' build
system sets that automatically if the EARLY_TA_PATHS list is
non-empty.

CFG_CORE_HEAP_SIZE is somewhat harder to make play along nicely with
other .bbappends that might have an opinion on its proper (minimum)
value. For now, keep adding it explicitly to EXTRA_OEMAKE.

Signed-off-by: Rasmus Villemoes <ravi@prevas.dk>
Signed-off-by: Jon Mason <jon.mason@arm.com>
This commit is contained in:
Rasmus Villemoes authored and Jon Mason committed 2026-09-10 00:53:12 -04:00
1 parent 9414135734
commit 9cbedaf381
1 file changed
+5 -5
Download Patch File Download Diff File Expand all files Collapse all files
meta-arm/recipes-security/optee-ftpm/optee-os_%.bbappend
+5 -5
View File
@@ -4,8 +4,8 @@ DEPENDS:append = "\
${@bb.utils.contains('MACHINE_FEATURES', 'optee-ftpm', 'optee-ftpm', '' , d)} \
"
EXTRA_OEMAKE:append = "\
${@bb.utils.contains('MACHINE_FEATURES', 'optee-ftpm', \
'CFG_CORE_HEAP_SIZE=131072 CFG_EARLY_TA=y EARLY_TA_PATHS="${STAGING_DIR_TARGET}/${base_libdir}/optee_armtz/${FTPM_UUID}.stripped.elf"', \
'', d)} \
"
python() {
if bb.utils.contains('MACHINE_FEATURES', 'optee-ftpm', True, False, d):
d.appendVar('EARLY_TA_PATHS', ' ${STAGING_DIR_TARGET}/${base_libdir}/optee_armtz/${FTPM_UUID}.stripped.elf')
d.appendVar('EXTRA_OEMAKE', ' CFG_CORE_HEAP_SIZE=131072')
}