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

diff --git a/meta-agl-core/conf/distro/include/aarch64-tune.inc b/meta-agl-core/conf/distro/include/aarch64-tune.inc
index 320b4f1..bf71369 100644 (file)
--- 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 fa68e05..e88f7f3 100644 (file)
--- 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 f8118de..1318396 100644 (file)
--- 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 4e5bb9f..bf166e2 100644 (file)
--- 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 :/