From 2b9e3c2111ae073b93a4092227fd06f2183812fb Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Tue, 26 May 2020 16:10:37 -0700 Subject: armv8/tunes: Set TUNE_PKGARCH_64 based on ARMPKGARCH The setting is to modify TUNE_PKGARCH which is filled with TUNE_PKGARCH_64 or TUNE_PKGARCH_32 in arm-arch64.inc This lets higher up tune files for arm64 SOCs override them if needed, this can help building multiple armv8 machines with different tunes in same workspace. No need to set TUNE_PKGARCH in tune files as it is synthesized from ARMPKGARCH Add ARMPKGARCH for aarch64 tunes (From OE-Core rev: 08433cc58abf0cf3e42b22d20870a50287cfb8bc) Signed-off-by: Khem Raj Signed-off-by: Richard Purdie --- meta/conf/machine/include/arm/arch-arm64.inc | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'meta/conf/machine/include/arm') diff --git a/meta/conf/machine/include/arm/arch-arm64.inc b/meta/conf/machine/include/arm/arch-arm64.inc index 53f4566815..6d5b22fff0 100644 --- a/meta/conf/machine/include/arm/arch-arm64.inc +++ b/meta/conf/machine/include/arm/arch-arm64.inc @@ -12,6 +12,8 @@ ARMPKGARCH_tune-aarch64 ?= "aarch64" ARMPKGARCH_tune-aarch64_be ?= "aarch64_be" TUNE_FEATURES_tune-aarch64 = "aarch64" TUNE_FEATURES_tune-aarch64_be = "${TUNE_FEATURES_tune-aarch64} bigendian" +TUNE_PKGARCH_64_tune-aarch64 = "aarch64" +TUNE_PKGARCH_64_tune-aarch64_be = "aarch64_be" BASE_LIB_tune-aarch64 = "lib64" BASE_LIB_tune-aarch64_be = "lib64" @@ -20,7 +22,7 @@ PACKAGE_EXTRA_ARCHS_tune-aarch64_be = "aarch64_be" ARMPKGSFX_ENDIAN_64 = "${@bb.utils.contains('TUNE_FEATURES', 'bigendian', '_be', '', d)}" TUNE_ARCH_64 = "aarch64${ARMPKGSFX_ENDIAN_64}" -TUNE_PKGARCH_64 = "aarch64${ARMPKGSFX_ENDIAN_64}" +TUNE_PKGARCH_64 = "${ARMPKGARCH}${ARMPKGSFX_ENDIAN_64}" ABIEXTENSION_64 = "" TARGET_FPU_64 = "" -- cgit v1.2.3-54-g00ecf