diff options
| 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/arch-armv5.inc | |
| parent | eb0cb7e8234f5d2e5623406e9660be91cf52f65e (diff) | |
| download | poky-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/arch-armv5.inc')
| -rw-r--r-- | meta/conf/machine/include/arm/arch-armv5.inc | 2 |
1 files changed, 1 insertions, 1 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" | |||
| 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 | ||