summaryrefslogtreecommitdiffstats
path: root/meta/conf
diff options
context:
space:
mode:
authorKhem Raj <raj.khem@gmail.com>2012-03-28 01:37:45 (GMT)
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-03-28 09:09:16 (GMT)
commitc73d382296aea6d9cd01076e87d61a9b9d890274 (patch)
tree67c31a1b30c8b1e60595ef18cd7c0967e42076f3 /meta/conf
parent7b01671f54f70c28c98457058c51ffefcb07c0e8 (diff)
downloadpoky-c73d382296aea6d9cd01076e87d61a9b9d890274.tar.gz
tune/armv7: Delete
armv7 is least common denominator of armv7-a armv7-m and armv7-r and armv7-m does not support ARM instructions but only thumb2 instruction set which means armv7 when chosen will complain if code is compiled in arm mode which is default in OE if not specified other wise if we chose this tuning errors like below pop up error: target CPU does not support ARM mode This tuning seems theoretical and base tune for armv7 would be one of armv7-a, armv7-m or armv7-r (From OE-Core rev: 75b8adbc042e0f65fb1286bc550d02becd3b6aea) Signed-off-by: Khem Raj <raj.khem@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/conf')
-rw-r--r--meta/conf/machine/include/arm/arch-armv7.inc56
-rw-r--r--meta/conf/machine/include/arm/arch-armv7a.inc3
-rw-r--r--meta/conf/machine/include/tune-armv7.inc2
3 files changed, 2 insertions, 59 deletions
diff --git a/meta/conf/machine/include/arm/arch-armv7.inc b/meta/conf/machine/include/arm/arch-armv7.inc
deleted file mode 100644
index 33d9f0d..0000000
--- a/meta/conf/machine/include/arm/arch-armv7.inc
+++ /dev/null
@@ -1,56 +0,0 @@
1DEFAULTTUNE ?= "armv7"
2
3ARMPKGARCH ?= "armv7"
4
5TUNEVALID[armv7] = "Enable instructions for ARMv7"
6TUNE_CONFLICTS[armv7] = "armv4 armv5 armv6"
7TUNE_CCARGS += "${@bb.utils.contains("TUNE_FEATURES", "armv7", "-march=armv7", "", d)}"
8MACHINEOVERRIDES .= "${@bb.utils.contains("TUNE_FEATURES", "armv7", ":armv7", "" ,d)}"
9
10require conf/machine/include/arm/arch-armv6.inc
11require conf/machine/include/arm/feature-arm-neon.inc
12
13# Little Endian base configs
14AVAILTUNES += "armv7 armv7t armv7-neon armv7t-neon"
15TUNE_FEATURES_tune-armv7 ?= "armv7 vfp"
16TUNE_FEATURES_tune-armv7t ?= "armv7 vfp thumb"
17TUNE_FEATURES_tune-armv7-neon ?= "armv7 vfp neon"
18TUNE_FEATURES_tune-armv7t-neon ?= "armv7 vfp neon thumb"
19PACKAGE_EXTRA_ARCHS_tune-armv7 = "${PACKAGE_EXTRA_ARCHS_tune-armv6} armv7-vfp"
20PACKAGE_EXTRA_ARCHS_tune-armv7t = "${PACKAGE_EXTRA_ARCHS_tune-armv6t} armv7-vfp armv7t2-vfp"
21PACKAGE_EXTRA_ARCHS_tune-armv7-neon = "${PACKAGE_EXTRA_ARCHS_tune-armv7} armv7-vfp-neon"
22PACKAGE_EXTRA_ARCHS_tune-armv7t-neon = "${PACKAGE_EXTRA_ARCHS_tune-armv7t} armv7-vfp-neon armv7at2-vfp-neon"
23
24# VFP Tunes
25AVAILTUNES += "armv7hf armv7thf armv7hf-neon armv7thf-neon"
26TUNE_FEATURES_tune-armv7hf ?= "${TUNE_FEATURES_tune-armv7} callconvention-hard"
27TUNE_FEATURES_tune-armv7thf ?= "${TUNE_FEATURES_tune-armv7t} callconvention-hard"
28TUNE_FEATURES_tune-armv7hf-neon ?= "${TUNE_FEATURES_tune-armv7-neon} callconvention-hard"
29TUNE_FEATURES_tune-armv7thf-neon ?= "${TUNE_FEATURES_tune_armv7t-neon} callconvention-hard"
30PACKAGE_EXTRA_ARCHS_tune-armv7hf = "${PACKAGE_EXTRA_ARCHS_tune-armv6hf} armv7hf-vfp"
31PACKAGE_EXTRA_ARCHS_tune-armv7thf = "${PACKAGE_EXTRA_ARCHS_tune-armv6thf} armv7hf-vfp armv7t2hf-vfp"
32PACKAGE_EXTRA_ARCHS_tune-armv7hf-neon = "${PACKAGE_EXTRA_ARCHS_tune-armv7hf} armv7hf-vfp-neon"
33PACKAGE_EXTRA_ARCHS_tune-armv7thf-neon = "${PACKAGE_EXTRA_ARCHS_tune-armv7thf} armv7hf-vfp-neon armv7at2hf-vfp-neon"
34
35# Big Endian
36AVAILTUNES += "armv7b armv7tb armv7b-neon armv7tb-neon"
37TUNE_FEATURES_tune-armv7b ?= "${TUNE_FEATURES_tune-armv7} bigendian"
38TUNE_FEATURES_tune-armv7tb ?= "${TUNE_FEATURES_tune-armv7t} bigendian"
39TUNE_FEATURES_tune-armv7b-neon ?= "${TUNE_FEATURES_tune-armv7-neon} bigendian"
40TUNE_FEATURES_tune-armv7tb-neon ?= "${TUNE_FEATURES_tune-armv7t-neon} bigendian"
41PACKAGE_EXTRA_ARCHS_tune-armv7b = "${PACKAGE_EXTRA_ARCHS_tune-armv6} armv7b-vfp"
42PACKAGE_EXTRA_ARCHS_tune-armv7tb = "${PACKAGE_EXTRA_ARCHS_tune-armv6t} armv7b-vfp armv7t2b-vfp"
43PACKAGE_EXTRA_ARCHS_tune-armv7b-neon = "${PACKAGE_EXTRA_ARCHS_tune-armv7} armv7b-vfp-neon"
44PACKAGE_EXTRA_ARCHS_tune-armv7tb-neon = "${PACKAGE_EXTRA_ARCHS_tune-armv7t} armv7b-vfp-neon armv7at2b-vfp-neon"
45
46# Big Endian + VFP
47AVAILTUNES += "armv7hfb armv7thfb armv7hfb-neon armv7thfb-neon"
48TUNE_FEATURES_tune-armv7hfb ?= "${TUNE_FEATURES_tune-armv7b} callconvention-hard"
49TUNE_FEATURES_tune-armv7thfb ?= "${TUNE_FEATURES_tune-armv7tb} callconvention-hard"
50TUNE_FEATURES_tune-armv7hfb-neon ?= "${TUNE_FEATURES_tune-armv7b-neon} callconvention-hard"
51TUNE_FEATURES_tune-armv7thfb-neon ?= "${TUNE_FEATURES_tune_armv7tb-neon} callconvention-hard"
52PACKAGE_EXTRA_ARCHS_tune-armv7hfb = "${PACKAGE_EXTRA_ARCHS_tune-armv6hfb} armv7hfb-vfp"
53PACKAGE_EXTRA_ARCHS_tune-armv7thfb = "${PACKAGE_EXTRA_ARCHS_tune-armv6thfb} armv7hfb-vfp armv7t2hfb-vfp"
54PACKAGE_EXTRA_ARCHS_tune-armv7hfb-neon = "${PACKAGE_EXTRA_ARCHS_tune-armv7hfb} armv7hfb-vfp-neon"
55PACKAGE_EXTRA_ARCHS_tune-armv7thfb-neon = "${PACKAGE_EXTRA_ARCHS_tune-armv7thfb} armv7hfb-vfp-neon armv7at2hfb-vfp-neon"
56
diff --git a/meta/conf/machine/include/arm/arch-armv7a.inc b/meta/conf/machine/include/arm/arch-armv7a.inc
index de39cb5..92640e2 100644
--- a/meta/conf/machine/include/arm/arch-armv7a.inc
+++ b/meta/conf/machine/include/arm/arch-armv7a.inc
@@ -7,7 +7,8 @@ TUNE_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)}"
9 9
10require conf/machine/include/arm/arch-armv7.inc 10require conf/machine/include/arm/arch-armv6.inc
11require conf/machine/include/arm/feature-arm-neon.inc
11 12
12# Little Endian base configs 13# Little Endian base configs
13AVAILTUNES += "armv7a armv7at armv7a-neon armv7at-neon" 14AVAILTUNES += "armv7a armv7at armv7a-neon armv7at-neon"
diff --git a/meta/conf/machine/include/tune-armv7.inc b/meta/conf/machine/include/tune-armv7.inc
deleted file mode 100644
index 664c24b..0000000
--- a/meta/conf/machine/include/tune-armv7.inc
+++ /dev/null
@@ -1,2 +0,0 @@
1require conf/machine/include/arm/arch-armv7.inc
2