From 863e3e10697ae0c47d98d6249b34e9d3dd7964db Mon Sep 17 00:00:00 2001 From: Ronan Le Martret Date: Mon, 23 Mar 2020 16:28:32 +0100 Subject: rcar-gen3: conf: Remove duplicate tune files - There is conflict between meta-renesas and poky * tune-cortexa53.inc * tune-cortexa57-cortexa53.inc use the upstream tune files from poky solve this issue. - Current tune-cortexa53.inc file, in RCAR BSP meta-renesas, the ebisu AGL build is broken due to the duplicate file: * bad TUNE_FEATURES means bad TUNE_ARCH and so bad TARGET_ARCH. Bug-AGL: SPEC-3289 Signed-off-by: Ronan Le Martret Change-Id: Ic981b7bf57304bf26fc530f5613cc19629eb835e Signed-off-by: Khang Nguyen Signed-off-by: Takamitsu Honda --- .../conf/machine/include/tune-cortexa53.inc | 3 --- .../machine/include/tune-cortexa57-cortexa53.inc | 20 -------------------- 2 files changed, 23 deletions(-) delete mode 100644 meta-rcar-gen3/conf/machine/include/tune-cortexa53.inc delete mode 100644 meta-rcar-gen3/conf/machine/include/tune-cortexa57-cortexa53.inc diff --git a/meta-rcar-gen3/conf/machine/include/tune-cortexa53.inc b/meta-rcar-gen3/conf/machine/include/tune-cortexa53.inc deleted file mode 100644 index 11aae17..0000000 --- a/meta-rcar-gen3/conf/machine/include/tune-cortexa53.inc +++ /dev/null @@ -1,3 +0,0 @@ -TUNECONFLICTS[aarch64] = "armv4 armv5 armv6 armv7 armv7a" - -MACHINEOVERRIDES =. "${@bb.utils.contains("TUNE_FEATURES", "cortexa53", "cortexa53:", "" ,d)}" diff --git a/meta-rcar-gen3/conf/machine/include/tune-cortexa57-cortexa53.inc b/meta-rcar-gen3/conf/machine/include/tune-cortexa57-cortexa53.inc deleted file mode 100644 index 9215497..0000000 --- a/meta-rcar-gen3/conf/machine/include/tune-cortexa57-cortexa53.inc +++ /dev/null @@ -1,20 +0,0 @@ -DEFAULTTUNE ?= "cortexa57-cortexa53" - -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" - -require conf/machine/include/arm/arch-armv8a.inc - -# Little Endian base configs -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" -- cgit 1.2.3-korg