aboutsummaryrefslogtreecommitdiffstats
path: root/meta/conf/machine/include/arm
diff options
context:
space:
mode:
authorJacob Kroon <jacob.kroon@mikrodidakt.se>2014-04-29 22:07:09 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-04-29 23:35:21 +0100
commite457d71641af8802e47eb4854072e3cfb957b001 (patch)
treed745eae773bb1084723457be9280f496e7ffc491 /meta/conf/machine/include/arm
parent64c44f02f1a320399e2f02aeaf83022bf83b69c8 (diff)
downloadopenembedded-core-contrib-e457d71641af8802e47eb4854072e3cfb957b001.tar.gz
feature-arm-thumb.inc: Suppress false warning
If a recipe does not explicitly set ARM_INSTRUCTION_SET, then there is no need to throw a warning: WARNING: Recipe 'foobar' selects ARM_INSTRUCTION_SET to be 'None', but tune configuration overrides it to 'arm' Signed-off-by: Jacob Kroon <jacob.kroon@mikrodidakt.se> 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/feature-arm-thumb.inc2
1 files changed, 2 insertions, 0 deletions
diff --git a/meta/conf/machine/include/arm/feature-arm-thumb.inc b/meta/conf/machine/include/arm/feature-arm-thumb.inc
index 8a3866568c..69c628ac9b 100644
--- a/meta/conf/machine/include/arm/feature-arm-thumb.inc
+++ b/meta/conf/machine/include/arm/feature-arm-thumb.inc
@@ -19,6 +19,8 @@ ARM_THUMB_SUFFIX .= "${@bb.utils.contains('TUNE_FEATURES', 'armv7m', 't2', '', d
ARM_M_OPT = "${@bb.utils.contains('TUNE_FEATURES', 'arm', '${ARM_THUMB_OPT}', 'thumb', d)}"
python () {
selected = d.getVar('ARM_INSTRUCTION_SET', True)
+ if selected == None:
+ return
used = d.getVar('ARM_M_OPT', True)
if selected != used:
pn = d.getVar('PN', True)