rcar-gen3: Use more appropriate tunes

From YP2.7, OE-Core has supported tune files for ARM Cortex-A53 [1]
and ARMv8 [2].
This commit modifies to use the new implementation which is
armv8+crc now.

[1] Poky rev: 2de809c9423e09f4152b2753ea13e78f5de0fef7
[2] Poky rev: 867032eba7c58fd104f1dd051b0fb802e92a73b5

Signed-off-by: Thuy Tran <thuy.tran.xh@renesas.com>
Signed-off-by: Takamitsu Honda <takamitsu.honda.pv@renesas.com>
Change-Id: Ib6af0a298f719e1eefe10f02c3d174fce47cd131

3 files changed, 25 insertions, 36 deletions

diff --git a/meta-rcar-gen3/conf/machine/include/tune-cortexa53.inc b/meta-rcar-gen3/conf/machine/include/tune-cortexa53.inc
index ebf2c4f..11aae17 100644
--- a/meta-rcar-gen3/conf/machine/include/tune-cortexa53.inc
+++ b/meta-rcar-gen3/conf/machine/include/tune-cortexa53.inc
@@ -1,18 +1,3 @@
-DEFAULTTUNE ?= "cortexa53"
-require conf/machine/include/arm/arch-armv8.inc
-
-TUNEVALID[cortexa53] = "Enable Cortex-A53 specific processor optimizations"
 TUNECONFLICTS[aarch64] = "armv4 armv5 armv6 armv7 armv7a"
 
-TUNE_CCARGS .= "${@bb.utils.contains("TUNE_FEATURES", "aarch64", " -march=armv8-a", "" ,d)}"
-
 MACHINEOVERRIDES =. "${@bb.utils.contains("TUNE_FEATURES", "cortexa53", "cortexa53:", "" ,d)}"
-
-TUNE_CCARGS .= "${@bb.utils.contains("TUNE_FEATURES", "cortexa53", " -mtune=cortex-a53", "", d)}"
-
-# Little Endian base configs
-AVAILTUNES += "cortexa53"
-ARMPKGARCH_tune-cortexa53 = "cortexa53"
-TUNE_FEATURES_tune-cortexa53 = "${TUNE_FEATURES_tune-aarch64} cortexa53"
-PACKAGE_EXTRA_ARCHS_tune-cortexa53 = "${PACKAGE_EXTRA_ARCHS_tune-aarch64} cortexa53"
-BASE_LIB_tune-cortexa53 = "lib64"
diff --git a/meta-rcar-gen3/conf/machine/include/tune-cortexa57-cortexa53.inc b/meta-rcar-gen3/conf/machine/include/tune-cortexa57-cortexa53.inc
index 17f1f25..9215497 100644
--- a/meta-rcar-gen3/conf/machine/include/tune-cortexa57-cortexa53.inc
+++ b/meta-rcar-gen3/conf/machine/include/tune-cortexa57-cortexa53.inc
@@ -1,18 +1,20 @@
 DEFAULTTUNE ?= "cortexa57-cortexa53"
-require conf/machine/include/arm/arch-armv8.inc
 
-TUNEVALID[cortexa57-cortexa53] = "Enable big.LITTLE Cortex-A57.Cortex-A53 specific processor optimizations"
-TUNECONFLICTS[aarch64] = "armv4 armv5 armv6 armv7 armv7a"
-
-TUNE_CCARGS .= "${@bb.utils.contains("TUNE_FEATURES", "aarch64", " -march=armv8-a", "" ,d)}"
+TUNEVALID[cortexa57-cortexa53] = "Enable Cortex-A57.Cortex-A53 specific processor optimizations"
+TUNE_CCARGS .= "${@bb.utils.contains('TUNE_FEATURES', 'cortexa57-cortexa53', ' -mcpu=cortex-a57.cortex-a53', '', d)}"
 
 MACHINEOVERRIDES =. "${@bb.utils.contains("TUNE_FEATURES", "cortexa57-cortexa53", "cortexa57-cortexa53:", "" ,d)}"
+TUNECONFLICTS[aarch64] = "armv4 armv5 armv6 armv7 armv7a"
 
-TUNE_CCARGS .= "${@bb.utils.contains("TUNE_FEATURES", "cortexa57-cortexa53", " -mtune=cortex-a57.cortex-a53", "", d)}"
+require conf/machine/include/arm/arch-armv8a.inc
 
 # Little Endian base configs
-AVAILTUNES += "cortexa57-cortexa53"
-ARMPKGARCH_tune-cortexa57-cortexa53 = "cortexa57-cortexa53"
-TUNE_FEATURES_tune-cortexa57-cortexa53 = "${TUNE_FEATURES_tune-aarch64} cortexa57-cortexa53"
-PACKAGE_EXTRA_ARCHS_tune-cortexa57-cortexa53 = "${PACKAGE_EXTRA_ARCHS_tune-aarch64} cortexa57-cortexa53"
-BASE_LIB_tune-cortexa57-cortexa53 = "lib64"
+AVAILTUNES += "cortexa57-cortexa53 cortexa57-cortexa53-crypto"
+ARMPKGARCH_tune-cortexa57-cortexa53             = "cortexa57-cortexa53"
+ARMPKGARCH_tune-cortexa57-cortexa53-crypto      = "cortexa57-cortexa53"
+TUNE_FEATURES_tune-cortexa57-cortexa53          = "aarch64 cortexa57-cortexa53 crc"
+TUNE_FEATURES_tune-cortexa57-cortexa53-crypto   = "aarch64 cortexa57-cortexa53 crc crypto"
+PACKAGE_EXTRA_ARCHS_tune-cortexa57-cortexa53             = "${PACKAGE_EXTRA_ARCHS_tune-armv8a-crc} cortexa57-cortexa53"
+PACKAGE_EXTRA_ARCHS_tune-cortexa57-cortexa53-crypto      = "${PACKAGE_EXTRA_ARCHS_tune-armv8a-crc-crypto} cortexa57-cortexa53 cortexa57-cortexa53-crypto"
+BASE_LIB_tune-cortexa57-cortexa53               = "lib64"
+BASE_LIB_tune-cortexa57-cortexa53-crypto        = "lib64"
diff --git a/meta-rcar-gen3/conf/machine/include/tune-cortexa57.inc b/meta-rcar-gen3/conf/machine/include/tune-cortexa57.inc
index 509aee4..b4944e0 100644
--- a/meta-rcar-gen3/conf/machine/include/tune-cortexa57.inc
+++ b/meta-rcar-gen3/conf/machine/include/tune-cortexa57.inc
@@ -1,18 +1,20 @@
 DEFAULTTUNE ?= "cortexa57"
-require conf/machine/include/arm/arch-armv8.inc
 
 TUNEVALID[cortexa57] = "Enable Cortex-A57 specific processor optimizations"
-TUNECONFLICTS[aarch64] = "armv4 armv5 armv6 armv7 armv7a"
-
-TUNE_CCARGS .= "${@bb.utils.contains("TUNE_FEATURES", "aarch64", " -march=armv8-a", "" ,d)}"
+TUNE_CCARGS .= "${@bb.utils.contains('TUNE_FEATURES', 'cortexa57', ' -mcpu=cortex-a57', '', d)}"
 
 MACHINEOVERRIDES =. "${@bb.utils.contains("TUNE_FEATURES", "cortexa57", "cortexa57:", "" ,d)}"
+TUNECONFLICTS[aarch64] = "armv4 armv5 armv6 armv7 armv7a"
 
-TUNE_CCARGS .= "${@bb.utils.contains("TUNE_FEATURES", "cortexa57", " -mtune=cortex-a57", "", d)}"
+require conf/machine/include/arm/arch-armv8a.inc
 
 # Little Endian base configs
-AVAILTUNES += "cortexa57"
-ARMPKGARCH_tune-cortexa57 = "cortexa57"
-TUNE_FEATURES_tune-cortexa57 = "${TUNE_FEATURES_tune-aarch64} cortexa57"
-PACKAGE_EXTRA_ARCHS_tune-cortexa57 = "${PACKAGE_EXTRA_ARCHS_tune-aarch64} cortexa57"
-BASE_LIB_tune-cortexa57 = "lib64"
+AVAILTUNES += "cortexa57 cortexa57-crypto"
+ARMPKGARCH_tune-cortexa57             = "cortexa57"
+ARMPKGARCH_tune-cortexa57-crypto      = "cortexa57"
+TUNE_FEATURES_tune-cortexa57          = "aarch64 cortexa57 crc"
+TUNE_FEATURES_tune-cortexa57-crypto   = "aarch64 cortexa57 crc crypto"
+PACKAGE_EXTRA_ARCHS_tune-cortexa57             = "${PACKAGE_EXTRA_ARCHS_tune-armv8a-crc} cortexa57"
+PACKAGE_EXTRA_ARCHS_tune-cortexa57-crypto      = "${PACKAGE_EXTRA_ARCHS_tune-armv8a-crc-crypto} cortexa57 cortexa57-crypto"
+BASE_LIB_tune-cortexa57               = "lib64"
+BASE_LIB_tune-cortexa57-crypto        = "lib64"