[PATCH 6/6] arm/optee-os: remove CFG_CORE_BTI from EXTRA_OEMAKE
Jon Mason <[email protected]>
| Newsgroups | org.yoctoproject.lists.meta-arm |
|---|---|
| Message-ID | <[email protected]> |
commit a3a2c49b2149606f314b2ee0aeba7d6becd12545 corrected a typo that was preventing arm-branch-protection flags from being enabled. However, since making this change, fvp-base with trusted services enabled no longer boots. However, the flag that seems to be the problem on fvp base is CFG_TA_BTI. Since this is the only use case for arm-branch-protection machine feature, remove it from the common file until this issue can be properly sorted. Signed-off-by: Jon Mason <[email protected]> --- meta-arm/recipes-security/optee/optee-os.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-arm/recipes-security/optee/optee-os.inc b/meta-arm/recipes-security/optee/optee-os.inc index 68bb1226b232..3065f71f6ec1 100644 --- a/meta-arm/recipes-security/optee/optee-os.inc +++ b/meta-arm/recipes-security/optee/optee-os.inc @@ -31,7 +31,7 @@ EXTRA_OEMAKE += " HOST_PREFIX=${HOST_PREFIX}" EXTRA_OEMAKE += " CROSS_COMPILE64=${HOST_PREFIX}" # Enable BTI in optee -EXTRA_OEMAKE += "${@bb.utils.contains('MACHINE_FEATURES', 'arm-branch-protection', ' CFG_CORE_BTI=1 CFG_TA_BTI=1 CFG_CORE_PAUTH=y CFG_TA_PAUTH=y', '', d)}" +EXTRA_OEMAKE += "${@bb.utils.contains('MACHINE_FEATURES', 'arm-branch-protection', ' CFG_TA_BTI=1 CFG_CORE_PAUTH=y CFG_TA_PAUTH=y', '', d)}" LDFLAGS[unexport] = "1" CPPFLAGS[unexport] = "1" -- 2.39.5 (Apple Git-154)