[meta-lsi] [PATCH 09/26] machine/axxiaarm*: Overwrite DEFAULTTUNE from local.conf

[Daniel Dragomir]

In axxiaarm and axxiaarm64 machine configuration files, the
DEFAULTTUNE variable was hard-coded to a default tune for each
board and the choice was done with CHIPSET variable.

Now the DEFAULTTUNE can be overwritten in local.conf with one of
available tunes and just when is not set, the default tunes will
be used.

Signed-off-by: Daniel Dragomir <daniel.dragomir at windriver.com>
---
 conf/machine/axxiaarm.conf               | 2 +-
 conf/machine/axxiaarm64.conf             | 2 +-
 conf/machine/include/arm/arch-armv8a.inc | 2 --
 conf/machine/include/tune-cortexa15.inc  | 2 --
 conf/machine/include/tune-cortexa53.inc  | 2 --
 conf/machine/include/tune-cortexa57.inc  | 2 --
 6 files changed, 2 insertions(+), 10 deletions(-)

diff --git a/conf/machine/axxiaarm.conf b/conf/machine/axxiaarm.conf
index 3b29595..00b56b0 100644
--- a/conf/machine/axxiaarm.conf
+++ b/conf/machine/axxiaarm.conf
@@ -24,7 +24,7 @@ require ${TUNE_${CHIPSET}}
 DEFAULTTUNE_X9 = "cortexa57_32-crypto"
 DEFAULTTUNE_XLF = "cortexa53_32-crypto"
 DEFAULTTUNE_5500 = "cortexa15-neon"
-DEFAULTTUNE = "${@bb.utils.contains('CHIPSET', 'X9', '${DEFAULTTUNE_X9}', \
+DEFAULTTUNE ?= "${@bb.utils.contains('CHIPSET', 'X9', '${DEFAULTTUNE_X9}', \
 	          bb.utils.contains('CHIPSET', 'XLF', '${DEFAULTTUNE_XLF}', '${DEFAULTTUNE_5500}', d), d)}"
 
 KARCH = "arm"
diff --git a/conf/machine/axxiaarm64.conf b/conf/machine/axxiaarm64.conf
index 8196156..d80c5c8 100644
--- a/conf/machine/axxiaarm64.conf
+++ b/conf/machine/axxiaarm64.conf
@@ -22,7 +22,7 @@ require ${TUNE_${CHIPSET}}
 # Armv8a SoCs supports 32-bit and 64-bit states. Set default to 32-bit state for axxiarm machine
 DEFAULTTUNE_X9 = "cortexa57_64-crypto"
 DEFAULTTUNE_XLF = "cortexa53_64-crypto"
-DEFAULTTUNE = "${@bb.utils.contains('CHIPSET', 'XLF', '${DEFAULTTUNE_XLF}', '${DEFAULTTUNE_X9}', d)}"
+DEFAULTTUNE ?= "${@bb.utils.contains('CHIPSET', 'XLF', '${DEFAULTTUNE_XLF}', '${DEFAULTTUNE_X9}', d)}"
 
 KARCH = "arm64"
 KERNEL_IMAGETYPE = "Image"
diff --git a/conf/machine/include/arm/arch-armv8a.inc b/conf/machine/include/arm/arch-armv8a.inc
index 779fe95..2a7ea04 100644
--- a/conf/machine/include/arm/arch-armv8a.inc
+++ b/conf/machine/include/arm/arch-armv8a.inc
@@ -1,5 +1,3 @@
-DEFAULTTUNE ?= "aarch64"
-
 TUNEVALID[arm] = "Enable ARM instruction set"
 TUNEVALID[aarch32] = "Enable instructions for 32bit state for ARMv8-a (AArch32)"
 TUNEVALID[aarch64] = "Enable instructions for 64bit state for ARMv8-a (AArch64)"
diff --git a/conf/machine/include/tune-cortexa15.inc b/conf/machine/include/tune-cortexa15.inc
index 3a84a92..33df6d2 100644
--- a/conf/machine/include/tune-cortexa15.inc
+++ b/conf/machine/include/tune-cortexa15.inc
@@ -1,5 +1,3 @@
-DEFAULTTUNE ?= "cortexa15-neon"
-
 require conf/machine/include/arm/arch-armv7a.inc
 
 TUNEVALID[cortexa15] = "Enable Cortex-A15 specific processor optimizations"
diff --git a/conf/machine/include/tune-cortexa53.inc b/conf/machine/include/tune-cortexa53.inc
index bdb4e00..eb3dd9a 100644
--- a/conf/machine/include/tune-cortexa53.inc
+++ b/conf/machine/include/tune-cortexa53.inc
@@ -1,5 +1,3 @@
-DEFAULTTUNE ?= "cortexa53_64-crypto"
-
 require conf/machine/include/arm/arch-armv8a.inc
 
 TUNEVALID[cortexa53] = "Enable Cortex-A53 specific processor optimizations"
diff --git a/conf/machine/include/tune-cortexa57.inc b/conf/machine/include/tune-cortexa57.inc
index e7bfdfa..d2f7fb5 100644
--- a/conf/machine/include/tune-cortexa57.inc
+++ b/conf/machine/include/tune-cortexa57.inc
@@ -1,5 +1,3 @@
-DEFAULTTUNE ?= "cortexa57_64-crypto"
-
 require conf/machine/include/arm/arch-armv8a.inc
 
 TUNEVALID[cortexa57] = "Enable Cortex-A57 specific processor optimizations"
-- 
2.7.4