summaryrefslogtreecommitdiffstats
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:36:10 +0100
commit985f818ab3400b60fb7cd51b084542382a3048af (patch)
treefc9f3a91ac8020eb83948676d0d96c68d8429c63
parent107269d9d02debe1adde9745df52da9dd5faf5c7 (diff)
downloadpoky-985f818ab3400b60fb7cd51b084542382a3048af.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' (From OE-Core rev: e457d71641af8802e47eb4854072e3cfb957b001) Signed-off-by: Jacob Kroon <jacob.kroon@mikrodidakt.se> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-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
19ARM_M_OPT = "${@bb.utils.contains('TUNE_FEATURES', 'arm', '${ARM_THUMB_OPT}', 'thumb', d)}" 19ARM_M_OPT = "${@bb.utils.contains('TUNE_FEATURES', 'arm', '${ARM_THUMB_OPT}', 'thumb', d)}"
20python () { 20python () {
21 selected = d.getVar('ARM_INSTRUCTION_SET', True) 21 selected = d.getVar('ARM_INSTRUCTION_SET', True)
22 if selected == None:
23 return
22 used = d.getVar('ARM_M_OPT', True) 24 used = d.getVar('ARM_M_OPT', True)
23 if selected != used: 25 if selected != used:
24 pn = d.getVar('PN', True) 26 pn = d.getVar('PN', True)