From 18c510e05c591d0da0b0c4fa454ed13fc0ebfffe Mon Sep 17 00:00:00 2001 From: Jon Mason Date: Thu, 8 Oct 2020 10:34:48 -0400 Subject: armv8/tunes: Move TUNECONFLICTS Move TUNECONFLICTS to the generic arm64 inc file, so that it can provide coverage for more than just the big.LITTLE tunes. (From OE-Core rev: 8022543d79b62b0daa4c988e17cd3e2c364d3cf1) Signed-off-by: Jon Mason Signed-off-by: Richard Purdie --- meta/conf/machine/include/arm/arch-arm64.inc | 1 + meta/conf/machine/include/tune-cortexa57-cortexa53.inc | 1 - meta/conf/machine/include/tune-cortexa72-cortexa53.inc | 1 - meta/conf/machine/include/tune-cortexa73-cortexa53.inc | 1 - 4 files changed, 1 insertion(+), 3 deletions(-) (limited to 'meta/conf') diff --git a/meta/conf/machine/include/arm/arch-arm64.inc b/meta/conf/machine/include/arm/arch-arm64.inc index 8a7de8e78f..142342298f 100644 --- a/meta/conf/machine/include/arm/arch-arm64.inc +++ b/meta/conf/machine/include/arm/arch-arm64.inc @@ -3,6 +3,7 @@ DEFAULTTUNE ?= "aarch64" require conf/machine/include/arm/arch-armv7ve.inc TUNEVALID[aarch64] = "Enable instructions for aarch64" +TUNECONFLICTS[aarch64] = "armv4 armv5 armv6 armv7 armv7a" MACHINEOVERRIDES =. "${@bb.utils.contains('TUNE_FEATURES', 'aarch64', 'aarch64:', '', d)}" diff --git a/meta/conf/machine/include/tune-cortexa57-cortexa53.inc b/meta/conf/machine/include/tune-cortexa57-cortexa53.inc index d86be7272f..d4b27cc14f 100644 --- a/meta/conf/machine/include/tune-cortexa57-cortexa53.inc +++ b/meta/conf/machine/include/tune-cortexa57-cortexa53.inc @@ -1,7 +1,6 @@ DEFAULTTUNE ?= "cortexa57-cortexa53" 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", "cortexa57-cortexa53", " -mcpu=cortex-a57.cortex-a53", "", d)}" MACHINEOVERRIDES =. "${@bb.utils.contains("TUNE_FEATURES", "cortexa57-cortexa53", "cortexa57-cortexa53:", "", d)}" diff --git a/meta/conf/machine/include/tune-cortexa72-cortexa53.inc b/meta/conf/machine/include/tune-cortexa72-cortexa53.inc index 64bb8337c3..52a96516af 100644 --- a/meta/conf/machine/include/tune-cortexa72-cortexa53.inc +++ b/meta/conf/machine/include/tune-cortexa72-cortexa53.inc @@ -1,7 +1,6 @@ DEFAULTTUNE ?= "cortexa72-cortexa53" TUNEVALID[cortexa72-cortexa53] = "Enable big.LITTLE Cortex-A72.Cortex-A53 specific processor optimizations" -TUNECONFLICTS[aarch64] = "armv4 armv5 armv6 armv7 armv7a" TUNE_CCARGS .= "${@bb.utils.contains("TUNE_FEATURES", "cortexa72-cortexa53", " -mcpu=cortex-a72.cortex-a53", "", d)}" MACHINEOVERRIDES =. "${@bb.utils.contains("TUNE_FEATURES", "cortexa72-cortexa53", "cortexa72-cortexa53:", "", d)}" diff --git a/meta/conf/machine/include/tune-cortexa73-cortexa53.inc b/meta/conf/machine/include/tune-cortexa73-cortexa53.inc index 4ec0f64d0e..765e8ebb92 100644 --- a/meta/conf/machine/include/tune-cortexa73-cortexa53.inc +++ b/meta/conf/machine/include/tune-cortexa73-cortexa53.inc @@ -1,7 +1,6 @@ DEFAULTTUNE ?= "cortexa73-cortexa53" TUNEVALID[cortexa73-cortexa53] = "Enable big.LITTLE Cortex-A73.Cortex-A53 specific processor optimizations" -TUNECONFLICTS[aarch64] = "armv4 armv5 armv6 armv7 armv7a" MACHINEOVERRIDES =. "${@bb.utils.contains("TUNE_FEATURES", "cortexa73-cortexa53", "cortexa73-cortexa53:", "", d)}" TUNE_CCARGS .= "${@bb.utils.contains("TUNE_FEATURES", "cortexa73-cortexa53", " -mcpu=cortex-a73.cortex-a53", "", d)}" -- cgit v1.2.3-54-g00ecf