summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorMartin Jansa <martin.jansa@gmail.com>2014-01-22 00:43:12 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-01-28 00:52:34 +0000
commita565ebd1daa145d42ae5731958496016e174fc19 (patch)
tree14f0913b1533e82934f15624a7e7ccd14ee2ed5b /meta
parent76ea30f243f2cec2e60dc5565382b22195b42fe2 (diff)
downloadpoky-a565ebd1daa145d42ae5731958496016e174fc19.tar.gz
feature-arm-thumb: Fix missing t2 suffix for armv7a MACHINEs
* unfortunatelly that note about armv7 matching also armv7a is no longer valid since armv7 include in armv7 was replaced with armv6+neon in this commit: commit 75b8adbc042e0f65fb1286bc550d02becd3b6aea Author: Khem Raj <raj.khem@gmail.com> Date: Tue Mar 27 18:37:45 2012 -0700 tune/armv7: Delete since then thumb and arm feeds had the same architecture * be aware that this will rename lots of feeds (From OE-Core rev: 8e8839215032b57763a07363a560c3fd9d6f8e01) 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')
-rw-r--r--meta/conf/machine/include/arm/feature-arm-thumb.inc3
1 files changed, 1 insertions, 2 deletions
diff --git a/meta/conf/machine/include/arm/feature-arm-thumb.inc b/meta/conf/machine/include/arm/feature-arm-thumb.inc
index bd754bea67..fa3a4e5c1f 100644
--- a/meta/conf/machine/include/arm/feature-arm-thumb.inc
+++ b/meta/conf/machine/include/arm/feature-arm-thumb.inc
@@ -9,11 +9,10 @@ ARM_THUMB_M_OPT = "${@['-marm', '-mthumb'][d.getVar('ARM_INSTRUCTION_SET', True)
9TUNE_CCARGS .= "${@bb.utils.contains("TUNE_FEATURES", "thumb", " ${ARM_THUMB_M_OPT}", "", d)}" 9TUNE_CCARGS .= "${@bb.utils.contains("TUNE_FEATURES", "thumb", " ${ARM_THUMB_M_OPT}", "", d)}"
10OVERRIDES .= "${@bb.utils.contains("TUNE_FEATURES", "thumb", ":thumb", "", d)}" 10OVERRIDES .= "${@bb.utils.contains("TUNE_FEATURES", "thumb", ":thumb", "", d)}"
11 11
12# Note armv7 will hit on armv7a as well
13ARMPKGSFX_THUMB .= "${@bb.utils.contains("TUNE_FEATURES", [ "armv4", "thumb" ], "t", "", d)}" 12ARMPKGSFX_THUMB .= "${@bb.utils.contains("TUNE_FEATURES", [ "armv4", "thumb" ], "t", "", d)}"
14ARMPKGSFX_THUMB .= "${@bb.utils.contains("TUNE_FEATURES", [ "armv5", "thumb" ], "t", "", d)}" 13ARMPKGSFX_THUMB .= "${@bb.utils.contains("TUNE_FEATURES", [ "armv5", "thumb" ], "t", "", d)}"
15ARMPKGSFX_THUMB .= "${@bb.utils.contains("TUNE_FEATURES", [ "armv6", "thumb" ], "t", "", d)}" 14ARMPKGSFX_THUMB .= "${@bb.utils.contains("TUNE_FEATURES", [ "armv6", "thumb" ], "t", "", d)}"
16ARMPKGSFX_THUMB .= "${@bb.utils.contains("TUNE_FEATURES", [ "armv7", "thumb" ], "t2", "", d)}" 15ARMPKGSFX_THUMB .= "${@bb.utils.contains("TUNE_FEATURES", [ "armv7a", "thumb" ], "t2", "", d)}"
17 16
18# Whether to compile with code to allow interworking between the two 17# Whether to compile with code to allow interworking between the two
19# instruction sets. This allows thumb code to be executed on a primarily 18# instruction sets. This allows thumb code to be executed on a primarily