[meta-lsi] [PATCH 08/26] machine/axxiaarm*: Choose proper tune for each CHIPSET

[Daniel Dragomir]

As long as we have specfic tunes, choose the proper tune depending
on the CHIPSET variable value in local.conf in axxiaarm and
axxiaarm64 machines:

*for axxiaarm:
   - CHIPSET = "5500" or not set (by default) -> cortexa15-neon tune
   - CHIPSET = "X9" -> cortexa57_32-crypto tune
   - CHIPSET = "XLF" -> cortexa53_32-crypto tune

*for axxiaarm64:
   - CHIPSET = "X9" or not set (by default) -> cortexa57_64-crypto tune
   - CHIPSET = "XLF" -> cortexa53_64-crypto tune

Signed-off-by: Daniel Dragomir <daniel.dragomir at windriver.com>
---
 conf/machine/axxiaarm.conf   | 18 +++++++++++++-----
 conf/machine/axxiaarm64.conf | 11 ++++++++++-
 2 files changed, 23 insertions(+), 6 deletions(-)

diff --git a/conf/machine/axxiaarm.conf b/conf/machine/axxiaarm.conf
index 707b413..3b29595 100644
--- a/conf/machine/axxiaarm.conf
+++ b/conf/machine/axxiaarm.conf
@@ -13,11 +13,19 @@ MACHINE_FEATURES += "ext3"
 
 MACHINE_EXTRA_RRECOMMENDS += ""
 
-TUNE_ARMV8A = "conf/machine/include/arm/arch-armv8a.inc"
-TUNE_ARMV7A = "conf/machine/include/tune-cortexa15.inc"
-TUNE = "${@bb.utils.contains('CHIPSET', 'X9', '${TUNE_ARMV8A}', '${TUNE_ARMV7A}', d)}"
-require ${TUNE}
-DEFAULTTUNE_armv8a = "armv8a-neon"
+# Default tune will be for 5500 board: cortexa17 (armv7a)
+CHIPSET ?= "5500"
+TUNE_X9 = "conf/machine/include/tune-cortexa57.inc"
+TUNE_XLF = "conf/machine/include/tune-cortexa53.inc"
+TUNE_5500 = "conf/machine/include/tune-cortexa15.inc"
+require ${TUNE_${CHIPSET}}
+
+# Armv8a SoCs supports 32-bit and 64-bit states. Set default to 32-bit state for axxiarm machine
+DEFAULTTUNE_X9 = "cortexa57_32-crypto"
+DEFAULTTUNE_XLF = "cortexa53_32-crypto"
+DEFAULTTUNE_5500 = "cortexa15-neon"
+DEFAULTTUNE = "${@bb.utils.contains('CHIPSET', 'X9', '${DEFAULTTUNE_X9}', \
+	          bb.utils.contains('CHIPSET', 'XLF', '${DEFAULTTUNE_XLF}', '${DEFAULTTUNE_5500}', d), d)}"
 
 KARCH = "arm"
 KERNEL_IMAGETYPE = "zImage"
diff --git a/conf/machine/axxiaarm64.conf b/conf/machine/axxiaarm64.conf
index d7be602..8196156 100644
--- a/conf/machine/axxiaarm64.conf
+++ b/conf/machine/axxiaarm64.conf
@@ -13,7 +13,16 @@ MACHINE_FEATURES += "ext3"
 
 MACHINE_EXTRA_RRECOMMENDS += ""
 
-require conf/machine/include/arm/arch-armv8.inc
+# Default tune will be for X9 board: cortexa57
+CHIPSET ?= "X9"
+TUNE_X9 = "conf/machine/include/tune-cortexa57.inc"
+TUNE_XLF = "conf/machine/include/tune-cortexa53.inc"
+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)}"
 
 KARCH = "arm64"
 KERNEL_IMAGETYPE = "Image"
-- 
2.7.4