aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJan-Simon Moeller <jsmoeller@linuxfoundation.org>2023-12-14 21:03:08 +0100
committerJan-Simon Moeller <jsmoeller@linuxfoundation.org>2023-12-15 07:41:40 +0000
commitadf081bab632c0fedfc064b50b953252c8f72be1 (patch)
treeb6b34da714649b74d648a0fce055b0d3d60f7d5b
parentf1f12ca4e45b38314bef5acedbfdc28a4d9dbd9f (diff)
Enforce DEFAULTTUNE even if overrides are used
Some BSPs do use a series of overrides. This can take over DEFAULTTUNE which we try to set for all boards in the same way. Bug-AGL: SPEC-5014 Change-Id: Iffd9c9cc4bf3352eea1c8b1a030202ac76ee1179 Signed-off-by: Jan-Simon Moeller <jsmoeller@linuxfoundation.org> Reviewed-on: https://gerrit.automotivelinux.org/gerrit/c/AGL/meta-agl/+/29530 Tested-by: Jenkins Job builder account ci-image-build: Jenkins Job builder account ci-image-boot-test: Jenkins Job builder account
-rw-r--r--meta-agl-core/conf/distro/include/aarch64-tune.inc3
-rw-r--r--meta-agl-core/conf/distro/include/arm-tune.inc2
-rw-r--r--meta-agl-core/conf/distro/include/riscv64-tune.inc2
-rw-r--r--meta-agl-core/conf/distro/include/x86_64-tune.inc2
4 files changed, 6 insertions, 3 deletions
diff --git a/meta-agl-core/conf/distro/include/aarch64-tune.inc b/meta-agl-core/conf/distro/include/aarch64-tune.inc
index 320b4f1ac..bf71369db 100644
--- a/meta-agl-core/conf/distro/include/aarch64-tune.inc
+++ b/meta-agl-core/conf/distro/include/aarch64-tune.inc
@@ -4,7 +4,8 @@
# A double inclusion would produce a warning. This include line is just for reference
# include conf/machine/include/arm/arch-armv8.inc
-DEFAULTTUNE:poky-agl := "aarch64"
+DEFAULTTUNE:forcevariable = "aarch64"
+
# not yet ready
#QB_SYSTEM_NAME ?= "qemu-system-aarch"
#QB_DEFAULT_KERNEL ?= "zImage"
diff --git a/meta-agl-core/conf/distro/include/arm-tune.inc b/meta-agl-core/conf/distro/include/arm-tune.inc
index fa68e05a7..e88f7f398 100644
--- a/meta-agl-core/conf/distro/include/arm-tune.inc
+++ b/meta-agl-core/conf/distro/include/arm-tune.inc
@@ -14,7 +14,9 @@ AGLDEFAULTTUNE := "${@bb.utils.contains('DISTRO_FEATURES', 'agl-medium-arm-compi
# for armv6 (=rpi0/1)
AGLDEFAULTTUNE := "${@bb.utils.contains('DISTRO_FEATURES', 'agl-low-arm-compiler', 'arm1176jzfshf', '${AGLDEFAULTTUNE}', d)}"
+
DEFAULTTUNE := "${AGLDEFAULTTUNE}"
+DEFAULTTUNE:forcevariable = "${AGLDEFAULTTUNE}"
QB_SYSTEM_NAME ?= "qemu-system-arm"
QB_DEFAULT_KERNEL ?= "zImage"
diff --git a/meta-agl-core/conf/distro/include/riscv64-tune.inc b/meta-agl-core/conf/distro/include/riscv64-tune.inc
index f8118dec3..1318396fd 100644
--- a/meta-agl-core/conf/distro/include/riscv64-tune.inc
+++ b/meta-agl-core/conf/distro/include/riscv64-tune.inc
@@ -4,4 +4,4 @@
# A double inclusion would produce a warning. This include line is just for reference
# include conf/machine/include/arm/arch-armv8.inc
-DEFAULTTUNE = "riscv64"
+DEFAULTTUNE:forcevariable = "riscv64"
diff --git a/meta-agl-core/conf/distro/include/x86_64-tune.inc b/meta-agl-core/conf/distro/include/x86_64-tune.inc
index 4e5bb9fda..bf166e2f8 100644
--- a/meta-agl-core/conf/distro/include/x86_64-tune.inc
+++ b/meta-agl-core/conf/distro/include/x86_64-tune.inc
@@ -3,7 +3,7 @@
# We should not need the tuning include below as the BSP should include the right set already.
# A double inclusion would produce a warning. This include line is just for reference
#include conf/machine/include/tune-corei7.inc
-DEFAULTTUNE = "corei7-64"
+DEFAULTTUNE:forcevariable = "corei7-64"
# shortened copy of tune-corei7.inc due to bug in inclusion for tune-core2.inc
# TUNE_ARCH is using .= x86-64 , if done twice, you get x86-64x86-64 as TUNE_ARCH :/