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/machine/include/arm/arch-armv6.inc | |
| parent | 1b40dac2c501ae8c8d812cf2866fe7917f144a19 (diff) | |
| download | openembedded-core-contrib-3fec966531059b4b21f40be3b22a60edf88c5190.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
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Diffstat (limited to 'meta/conf/machine/include/arm/arch-armv6.inc')
| -rw-r--r-- | meta/conf/machine/include/arm/arch-armv6.inc | 2 |
1 files changed, 1 insertions, 1 deletions
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)}" |