arm/arch-armv9*: Fix PACKAGE_EXTRA_ARCHS reference
PATCH 1/3 arm/arch-armv9*: Fix PACKAGE_EXTRA_ARCHS reference
PACKAGE_EXTRA_ARCHS references armv8 instead of armv9
--- meta-arm/conf/machine/include/arm/arch-armv9-1a.inc | 2 +- meta-arm/conf/machine/include/arm/arch-armv9-2a.inc | 2 +- meta-arm/conf/machine/include/arm/arch-armv9-3a.inc | 2 +- meta-arm/conf/machine/include/arm/arch-armv9-4a.inc | 2 +- meta-arm/conf/machine/include/arm/arch-armv9-5a.inc | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-)
meta-arm/conf/machine/include/arm/arch-armv9-1a.inc +1 -1
@@ -9,5 +9,5 @@ require conf/machine/include/arm/arch-armv9a.inc AVAILTUNES += "armv9-1a" ARMPKGARCH:tune-armv9-1a ?= "armv9-1a" TUNE_FEATURES:tune-armv9-1a = "aarch64 armv9-1a" -PACKAGE_EXTRA_ARCHS:tune-armv9-1a = "${PACKAGE_EXTRA_ARCHS:tune-armv8a} armv9-1a" +PACKAGE_EXTRA_ARCHS:tune-armv9-1a = "${PACKAGE_EXTRA_ARCHS:tune-armv9a} armv9-1a" BASE_LIB:tune-armv9-1a = "lib64"
meta-arm/conf/machine/include/arm/arch-armv9-2a.inc +1 -1
@@ -9,5 +9,5 @@ require conf/machine/include/arm/arch-armv9a.inc AVAILTUNES += "armv9-2a" ARMPKGARCH:tune-armv9-2a ?= "armv9-2a" TUNE_FEATURES:tune-armv9-2a = "aarch64 armv9-2a" -PACKAGE_EXTRA_ARCHS:tune-armv9-2a = "${PACKAGE_EXTRA_ARCHS:tune-armv8a} armv9-2a" +PACKAGE_EXTRA_ARCHS:tune-armv9-2a = "${PACKAGE_EXTRA_ARCHS:tune-armv9a} armv9-2a" BASE_LIB:tune-armv9-2a = "lib64"
meta-arm/conf/machine/include/arm/arch-armv9-3a.inc +1 -1
@@ -9,5 +9,5 @@ require conf/machine/include/arm/arch-armv9a.inc AVAILTUNES += "armv9-3a" ARMPKGARCH:tune-armv9-3a ?= "armv9-3a" TUNE_FEATURES:tune-armv9-3a = "aarch64 armv9-3a" -PACKAGE_EXTRA_ARCHS:tune-armv9-3a = "${PACKAGE_EXTRA_ARCHS:tune-armv8a} armv9-3a" +PACKAGE_EXTRA_ARCHS:tune-armv9-3a = "${PACKAGE_EXTRA_ARCHS:tune-armv9a} armv9-3a" BASE_LIB:tune-armv9-3a = "lib64"
meta-arm/conf/machine/include/arm/arch-armv9-4a.inc +1 -1
@@ -9,5 +9,5 @@ require conf/machine/include/arm/arch-armv9a.inc AVAILTUNES += "armv9-4a" ARMPKGARCH:tune-armv9-4a ?= "armv9-4a" TUNE_FEATURES:tune-armv9-4a = "aarch64 armv9-4a" -PACKAGE_EXTRA_ARCHS:tune-armv9-4a = "${PACKAGE_EXTRA_ARCHS:tune-armv8a} armv9-4a" +PACKAGE_EXTRA_ARCHS:tune-armv9-4a = "${PACKAGE_EXTRA_ARCHS:tune-armv9a} armv9-4a" BASE_LIB:tune-armv9-4a = "lib64"
meta-arm/conf/machine/include/arm/arch-armv9-5a.inc +1 -1
@@ -9,5 +9,5 @@ require conf/machine/include/arm/arch-armv9a.inc AVAILTUNES += "armv9-5a" ARMPKGARCH:tune-armv9-5a ?= "armv9-5a" TUNE_FEATURES:tune-armv9-5a = "aarch64 armv9-5a" -PACKAGE_EXTRA_ARCHS:tune-armv9-5a = "${PACKAGE_EXTRA_ARCHS:tune-armv8a} armv9-5a" +PACKAGE_EXTRA_ARCHS:tune-armv9-5a = "${PACKAGE_EXTRA_ARCHS:tune-armv9a} armv9-5a" BASE_LIB:tune-armv9-5a = "lib64"
Signature · 1 line
2.39.5 (Apple Git-154)
PATCH 2/3 arm-bsp/fvp-base: remove console workaround
Remove the KERNEL_CONSOLE workaround, as that has now been upstreamed should should no longer be needed.
--- meta-arm-bsp/conf/machine/fvp-base.conf | 2 -- 1 file changed, 2 deletions(-)
meta-arm-bsp/conf/machine/fvp-base.conf +0 -2
@@ -17,8 +17,6 @@ IMAGE_FSTYPES += "wic" WKS_FILE ?= "efi-disk.wks.in" SERIAL_CONSOLES = "115200;ttyAMA0" -# FIXME - This is being upstreamed. Remove once that has occurred. -KERNEL_CONSOLE ?= "${@','.join(d.getVar('SERIAL_CONSOLES').split(' ')[0].split(';')[::-1]) or 'ttyS0'}" PREFERRED_PROVIDER_virtual/kernel ?= "linux-yocto" KERNEL_DTB_NAME = "fvp-base-revc.dtb"
Signature · 1 line
2.39.5 (Apple Git-154)
PATCH 3/3 arm/optee-os: remove CFG_CORE_BTI from EXTRA_OEMAKE
In reply to Jon Masoncommit 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.
--- meta-arm/recipes-security/optee/optee-os.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
meta-arm/recipes-security/optee/optee-os.inc +1 -1
@@ -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"
Signature · 1 line
2.39.5 (Apple Git-154)
Jon Mason
AppliedQuoted 3 lines · Jon Mason
PACKAGE_EXTRA_ARCHSreferences armv8 instead of armv9
Applied, thanks!
[1/3] arm/arch-armv9*: Fix PACKAGE_EXTRA_ARCHS reference
commit: 05b2de0e7a9b71e61c16f7607546b846fb87648c
[2/3] arm-bsp/fvp-base: remove console workaround
commit: 5442973e13df30e4cde0fab23b2dbafd03a3407d
[3/3] arm/optee-os: remove CFG_CORE_BTI from EXTRA_OEMAKE
commit: e517e47d2ed44c79ecbdff2a0ef43fc62783b05fBest regards,
Signature · 1 line
Jon Mason <[email protected]>