summaryrefslogtreecommitdiffstats
path: root/meta/conf/machine/include/powerpc
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/powerpc
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/powerpc')
-rw-r--r--meta/conf/machine/include/powerpc/arch-powerpc64.inc2
1 files changed, 1 insertions, 1 deletions
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"
3require conf/machine/include/powerpc/arch-powerpc.inc 3require conf/machine/include/powerpc/arch-powerpc.inc
4 4
5TUNEVALID[m64] = "Power ELF64 standard ABI" 5TUNEVALID[m64] = "Power ELF64 standard ABI"
6TUNE_CONFLICTS[m64] = "m32 nf" 6TUNECONFLICTS[m64] = "m32 nf"
7TUNE_CCARGS += "${@bb.utils.contains("TUNE_FEATURES", "m64", "-m64", "", d)}" 7TUNE_CCARGS += "${@bb.utils.contains("TUNE_FEATURES", "m64", "-m64", "", d)}"
8TUNE_ARCH .= "${@bb.utils.contains("TUNE_FEATURES", [ "m64" ], "powerpc64", "", d)}" 8TUNE_ARCH .= "${@bb.utils.contains("TUNE_FEATURES", [ "m64" ], "powerpc64", "", d)}"
9 9