From: Jacob Kroon Date: Tue, 29 Apr 2014 20:07:09 +0000 (+0200) Subject: feature-arm-thumb.inc: Suppress false warning X-Git-Tag: 2015-4~2983 X-Git-Url: https://code.ossystems.io/gitweb?a=commitdiff_plain;h=e457d71641af8802e47eb4854072e3cfb957b001;p=openembedded-core.git 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 Signed-off-by: Richard Purdie --- 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)