diff options
| author | Martin Jansa <martin.jansa@gmail.com> | 2012-07-07 10:31:54 +0200 |
|---|---|---|
| committer | Saul Wold <sgw@linux.intel.com> | 2012-07-16 08:31:40 -0700 |
| commit | 3fec966531059b4b21f40be3b22a60edf88c5190 (patch) | |
| tree | 7dfa4ca1c77937fe1b43df2e58471c3a0784ece4 /meta/conf | |
| parent | 1b40dac2c501ae8c8d812cf2866fe7917f144a19 (diff) | |
| download | openembedded-core-3fec966531059b4b21f40be3b22a60edf88c5190.tar.gz openembedded-core-3fec966531059b4b21f40be3b22a60edf88c5190.tar.bz2 openembedded-core-3fec966531059b4b21f40be3b22a60edf88c5190.zip | |
conf/machine: replace TUNE_CONFLICTS with TUNECONFLICTS
* it wasn't consistent with other machine configs
* reported 2 months ago..
http://lists.linuxtogo.org/pipermail/openembedded-core/2012-May/022154.html
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Diffstat (limited to 'meta/conf')
| -rw-r--r-- | meta/conf/machine/include/arm/arch-armv5.inc | 2 | ||||
| -rw-r--r-- | meta/conf/machine/include/arm/arch-armv6.inc | 2 | ||||
| -rw-r--r-- | meta/conf/machine/include/arm/arch-armv7a.inc | 2 | ||||
| -rw-r--r-- | meta/conf/machine/include/powerpc/arch-powerpc64.inc | 2 | ||||
| -rw-r--r-- | meta/conf/machine/include/tune-mips32.inc | 2 |
5 files changed, 5 insertions, 5 deletions
diff --git a/meta/conf/machine/include/arm/arch-armv5.inc b/meta/conf/machine/include/arm/arch-armv5.inc index 4a75530bb1..98780e55c5 100644 --- a/meta/conf/machine/include/arm/arch-armv5.inc +++ b/meta/conf/machine/include/arm/arch-armv5.inc @@ -3,7 +3,7 @@ DEFAULTTUNE ?= "armv5" ARMPKGARCH ?= "armv5" TUNEVALID[armv5] = "Enable instructions for ARMv5" -TUNE_CONFLICTS[armv5] = "armv4" +TUNECONFLICTS[armv5] = "armv4" TUNE_CCARGS += "${@bb.utils.contains("TUNE_FEATURES", "armv5", "-march=armv5${ARMPKGSFX_THUMB}${ARMPKGSFX_DSP}", "", d)}" MACHINEOVERRIDES .= "${@bb.utils.contains("TUNE_FEATURES", "armv5", ":armv5", "" ,d)}" diff --git a/meta/conf/machine/include/arm/arch-armv6.inc b/meta/conf/machine/include/arm/arch-armv6.inc index da8274e296..f0fee93d3f 100644 --- a/meta/conf/machine/include/arm/arch-armv6.inc +++ b/meta/conf/machine/include/arm/arch-armv6.inc @@ -3,7 +3,7 @@ DEFAULTTUNE ?= "armv6" ARMPKGARCH ?= "armv6" TUNEVALID[armv6] = "Enable instructions for ARMv6" -TUNE_CONFLICTS[armv6] = "armv4 armv5" +TUNECONFLICTS[armv6] = "armv4 armv5" TUNE_CCARGS += "${@bb.utils.contains("TUNE_FEATURES", "armv6", "-march=armv6", "", d)}" MACHINEOVERRIDES .= "${@bb.utils.contains("TUNE_FEATURES", "armv6", ":armv6", "" ,d)}" diff --git a/meta/conf/machine/include/arm/arch-armv7a.inc b/meta/conf/machine/include/arm/arch-armv7a.inc index c90aff5ae8..f439de7a87 100644 --- a/meta/conf/machine/include/arm/arch-armv7a.inc +++ b/meta/conf/machine/include/arm/arch-armv7a.inc @@ -3,7 +3,7 @@ DEFAULTTUNE ?= "armv7a" ARMPKGARCH ?= "armv7a" TUNEVALID[armv7a] = "Enable instructions for ARMv7-a" -TUNE_CONFLICTS[armv7a] = "armv4 armv5 armv6 armv7" +TUNECONFLICTS[armv7a] = "armv4 armv5 armv6 armv7" TUNE_CCARGS += "${@bb.utils.contains("TUNE_FEATURES", "armv7a", "-march=armv7-a -fno-tree-vectorize", "", d)}" MACHINEOVERRIDES .= "${@bb.utils.contains("TUNE_FEATURES", "armv7a", ":armv7a", "" ,d)}" diff --git a/meta/conf/machine/include/powerpc/arch-powerpc64.inc b/meta/conf/machine/include/powerpc/arch-powerpc64.inc index a5e975574e..f9e2b2a4c4 100644 --- a/meta/conf/machine/include/powerpc/arch-powerpc64.inc +++ b/meta/conf/machine/include/powerpc/arch-powerpc64.inc @@ -3,7 +3,7 @@ DEFAULTTUNE ?= "powerpc64" require conf/machine/include/powerpc/arch-powerpc.inc TUNEVALID[m64] = "Power ELF64 standard ABI" -TUNE_CONFLICTS[m64] = "m32 nf" +TUNECONFLICTS[m64] = "m32 nf" TUNE_CCARGS += "${@bb.utils.contains("TUNE_FEATURES", "m64", "-m64", "", d)}" TUNE_ARCH .= "${@bb.utils.contains("TUNE_FEATURES", [ "m64" ], "powerpc64", "", d)}" diff --git a/meta/conf/machine/include/tune-mips32.inc b/meta/conf/machine/include/tune-mips32.inc index 93ed5ee793..03cd41123f 100644 --- a/meta/conf/machine/include/tune-mips32.inc +++ b/meta/conf/machine/include/tune-mips32.inc @@ -3,7 +3,7 @@ DEFAULTTUNE ?= "mips32" require conf/machine/include/mips/arch-mips.inc TUNEVALID[mips32] = "Enable mips32 specific processor optimizations" -TUNE_CONFLICTS[mips32] = "n64 n32" +TUNECONFLICTS[mips32] = "n64 n32" TUNE_CCARGS += "${@bb.utils.contains("TUNE_FEATURES", "mips32", "-march=mips32", "", d)}" AVAILTUNES += "mips32 mips32el mips32-nf mips32el-nf" |