summaryrefslogtreecommitdiffstats
path: root/meta/conf/machine/include/arm
diff options
context:
space:
mode:
authorMartin Jansa <martin.jansa@gmail.com>2012-07-07 10:31:54 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-07-17 10:53:53 +0100
commit1f7f9258c4c37e4c54854dcc6b4ba7a4a2828efd (patch)
tree5897e345d2e3d626d045c8a2c575cf04c4ddb139 /meta/conf/machine/include/arm
parenteb0cb7e8234f5d2e5623406e9660be91cf52f65e (diff)
downloadpoky-1f7f9258c4c37e4c54854dcc6b4ba7a4a2828efd.tar.gz
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 (From OE-Core rev: 3fec966531059b4b21f40be3b22a60edf88c5190) Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/conf/machine/include/arm')
-rw-r--r--meta/conf/machine/include/arm/arch-armv5.inc2
-rw-r--r--meta/conf/machine/include/arm/arch-armv6.inc2
-rw-r--r--meta/conf/machine/include/arm/arch-armv7a.inc2
3 files changed, 3 insertions, 3 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"
3ARMPKGARCH ?= "armv5" 3ARMPKGARCH ?= "armv5"
4 4
5TUNEVALID[armv5] = "Enable instructions for ARMv5" 5TUNEVALID[armv5] = "Enable instructions for ARMv5"
6TUNE_CONFLICTS[armv5] = "armv4" 6TUNECONFLICTS[armv5] = "armv4"
7TUNE_CCARGS += "${@bb.utils.contains("TUNE_FEATURES", "armv5", "-march=armv5${ARMPKGSFX_THUMB}${ARMPKGSFX_DSP}", "", d)}" 7TUNE_CCARGS += "${@bb.utils.contains("TUNE_FEATURES", "armv5", "-march=armv5${ARMPKGSFX_THUMB}${ARMPKGSFX_DSP}", "", d)}"
8MACHINEOVERRIDES .= "${@bb.utils.contains("TUNE_FEATURES", "armv5", ":armv5", "" ,d)}" 8MACHINEOVERRIDES .= "${@bb.utils.contains("TUNE_FEATURES", "armv5", ":armv5", "" ,d)}"
9 9
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"
3ARMPKGARCH ?= "armv6" 3ARMPKGARCH ?= "armv6"
4 4
5TUNEVALID[armv6] = "Enable instructions for ARMv6" 5TUNEVALID[armv6] = "Enable instructions for ARMv6"
6TUNE_CONFLICTS[armv6] = "armv4 armv5" 6TUNECONFLICTS[armv6] = "armv4 armv5"
7TUNE_CCARGS += "${@bb.utils.contains("TUNE_FEATURES", "armv6", "-march=armv6", "", d)}" 7TUNE_CCARGS += "${@bb.utils.contains("TUNE_FEATURES", "armv6", "-march=armv6", "", d)}"
8MACHINEOVERRIDES .= "${@bb.utils.contains("TUNE_FEATURES", "armv6", ":armv6", "" ,d)}" 8MACHINEOVERRIDES .= "${@bb.utils.contains("TUNE_FEATURES", "armv6", ":armv6", "" ,d)}"
9 9
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"
3ARMPKGARCH ?= "armv7a" 3ARMPKGARCH ?= "armv7a"
4 4
5TUNEVALID[armv7a] = "Enable instructions for ARMv7-a" 5TUNEVALID[armv7a] = "Enable instructions for ARMv7-a"
6TUNE_CONFLICTS[armv7a] = "armv4 armv5 armv6 armv7" 6TUNECONFLICTS[armv7a] = "armv4 armv5 armv6 armv7"
7TUNE_CCARGS += "${@bb.utils.contains("TUNE_FEATURES", "armv7a", "-march=armv7-a -fno-tree-vectorize", "", d)}" 7TUNE_CCARGS += "${@bb.utils.contains("TUNE_FEATURES", "armv7a", "-march=armv7-a -fno-tree-vectorize", "", d)}"
8MACHINEOVERRIDES .= "${@bb.utils.contains("TUNE_FEATURES", "armv7a", ":armv7a", "" ,d)}" 8MACHINEOVERRIDES .= "${@bb.utils.contains("TUNE_FEATURES", "armv7a", ":armv7a", "" ,d)}"
9 9