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>
author: Martin Jansa <martin.jansa@gmail.com> 2012-07-07 10:31:54 +0200
committer: Richard Purdie <richard.purdie@linuxfoundation.org> 2012-07-17 10:53:53 +0100
commit: 1f7f9258c4c37e4c54854dcc6b4ba7a4a2828efd (patch)
tree: 5897e345d2e3d626d045c8a2c575cf04c4ddb139 /meta/conf/machine/include/arm
parent: eb0cb7e8234f5d2e5623406e9660be91cf52f65e (diff)
download: poky-1f7f9258c4c37e4c54854dcc6b4ba7a4a2828efd.tar.gz
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"
 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)}"
author	Martin Jansa <martin.jansa@gmail.com>	2012-07-07 10:31:54 +0200
committer	Richard Purdie <richard.purdie@linuxfoundation.org>	2012-07-17 10:53:53 +0100
commit	1f7f9258c4c37e4c54854dcc6b4ba7a4a2828efd (patch)
tree	5897e345d2e3d626d045c8a2c575cf04c4ddb139 /meta/conf/machine/include/arm
parent	eb0cb7e8234f5d2e5623406e9660be91cf52f65e (diff)
download	poky-1f7f9258c4c37e4c54854dcc6b4ba7a4a2828efd.tar.gz

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"
3	ARMPKGARCH ?= "armv5"	3	ARMPKGARCH ?= "armv5"
4		4
5	TUNEVALID[armv5] = "Enable instructions for ARMv5"	5	TUNEVALID[armv5] = "Enable instructions for ARMv5"
6	TUNE_CONFLICTS[armv5] = "armv4"	6	TUNECONFLICTS[armv5] = "armv4"
7	TUNE_CCARGS += "${@bb.utils.contains("TUNE_FEATURES", "armv5", "-march=armv5${ARMPKGSFX_THUMB}${ARMPKGSFX_DSP}", "", d)}"	7	TUNE_CCARGS += "${@bb.utils.contains("TUNE_FEATURES", "armv5", "-march=armv5${ARMPKGSFX_THUMB}${ARMPKGSFX_DSP}", "", d)}"
8	MACHINEOVERRIDES .= "${@bb.utils.contains("TUNE_FEATURES", "armv5", ":armv5", "" ,d)}"	8	MACHINEOVERRIDES .= "${@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"
3	ARMPKGARCH ?= "armv6"	3	ARMPKGARCH ?= "armv6"
4		4
5	TUNEVALID[armv6] = "Enable instructions for ARMv6"	5	TUNEVALID[armv6] = "Enable instructions for ARMv6"
6	TUNE_CONFLICTS[armv6] = "armv4 armv5"	6	TUNECONFLICTS[armv6] = "armv4 armv5"
7	TUNE_CCARGS += "${@bb.utils.contains("TUNE_FEATURES", "armv6", "-march=armv6", "", d)}"	7	TUNE_CCARGS += "${@bb.utils.contains("TUNE_FEATURES", "armv6", "-march=armv6", "", d)}"
8	MACHINEOVERRIDES .= "${@bb.utils.contains("TUNE_FEATURES", "armv6", ":armv6", "" ,d)}"	8	MACHINEOVERRIDES .= "${@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"
3	ARMPKGARCH ?= "armv7a"	3	ARMPKGARCH ?= "armv7a"
4		4
5	TUNEVALID[armv7a] = "Enable instructions for ARMv7-a"	5	TUNEVALID[armv7a] = "Enable instructions for ARMv7-a"
6	TUNE_CONFLICTS[armv7a] = "armv4 armv5 armv6 armv7"	6	TUNECONFLICTS[armv7a] = "armv4 armv5 armv6 armv7"
7	TUNE_CCARGS += "${@bb.utils.contains("TUNE_FEATURES", "armv7a", "-march=armv7-a -fno-tree-vectorize", "", d)}"	7	TUNE_CCARGS += "${@bb.utils.contains("TUNE_FEATURES", "armv7a", "-march=armv7-a -fno-tree-vectorize", "", d)}"
8	MACHINEOVERRIDES .= "${@bb.utils.contains("TUNE_FEATURES", "armv7a", ":armv7a", "" ,d)}"	8	MACHINEOVERRIDES .= "${@bb.utils.contains("TUNE_FEATURES", "armv7a", ":armv7a", "" ,d)}"
9		9