summaryrefslogtreecommitdiffstats
path: root/meta/conf/machine/include/arm
diff options
context:
space:
mode:
authorPeter Seebach <peter.seebach@windriver.com>2012-05-01 20:45:10 -0500
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-05-06 09:55:46 +0100
commit7b078123b78805b5f973b453a07808cdcfa0ae36 (patch)
tree042f7179d25a4d50ddc9acd5b60b57cd978b8a66 /meta/conf/machine/include/arm
parent7f11bbb9bbc55001928bec799a39a32e9fa85659 (diff)
downloadpoky-7b078123b78805b5f973b453a07808cdcfa0ae36.tar.gz
conf/machine: Clean up configuration values.
This cleans up and/or corrects a few values from machine includes for consistency with future toolchain sanity checks, and also adds the TUNEVALID and TUNECONFLICTS to documentation.conf. (From OE-Core rev: 6ffe53c721a80cf156b44f59b564f2e899c6af50) Signed-off-by: Peter Seebach <peter.seebach@windriver.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-dsp.inc1
-rw-r--r--meta/conf/machine/include/arm/arch-armv7a.inc2
2 files changed, 2 insertions, 1 deletions
diff --git a/meta/conf/machine/include/arm/arch-armv5-dsp.inc b/meta/conf/machine/include/arm/arch-armv5-dsp.inc
index 9f03a0fd76..0f64562f4b 100644
--- a/meta/conf/machine/include/arm/arch-armv5-dsp.inc
+++ b/meta/conf/machine/include/arm/arch-armv5-dsp.inc
@@ -1,4 +1,5 @@
1ARMPKGSFX_DSP = "${@bb.utils.contains("TUNE_FEATURES", [ "armv5", "dsp" ], "e", "", d)}" 1ARMPKGSFX_DSP = "${@bb.utils.contains("TUNE_FEATURES", [ "armv5", "dsp" ], "e", "", d)}"
2TUNEVALID[dsp] = "ARM DSP functionality"
2 3
3require conf/machine/include/arm/arch-armv5.inc 4require conf/machine/include/arm/arch-armv5.inc
4 5
diff --git a/meta/conf/machine/include/arm/arch-armv7a.inc b/meta/conf/machine/include/arm/arch-armv7a.inc
index 629960d2da..c90aff5ae8 100644
--- a/meta/conf/machine/include/arm/arch-armv7a.inc
+++ b/meta/conf/machine/include/arm/arch-armv7a.inc
@@ -2,7 +2,7 @@ DEFAULTTUNE ?= "armv7a"
2 2
3ARMPKGARCH ?= "armv7a" 3ARMPKGARCH ?= "armv7a"
4 4
5TUNEVALID[armv7-a] = "Enable instructions for ARMv7-a" 5TUNEVALID[armv7a] = "Enable instructions for ARMv7-a"
6TUNE_CONFLICTS[armv7a] = "armv4 armv5 armv6 armv7" 6TUNE_CONFLICTS[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)}"