diff options
| author | Jason M. Bills <jason.m.bills@linux.intel.com> | 2019-10-22 23:54:16 +0300 |
|---|---|---|
| committer | Jason M. Bills <jason.m.bills@linux.intel.com> | 2019-10-22 23:54:16 +0300 |
| commit | 9722c6ee87766a45a337c094d1293de81cdcb106 (patch) | |
| tree | 08b57716ae3c02fef2bc870b634019e692fd70e6 /poky/meta/conf/machine/include/arm/feature-arm-thumb.inc | |
| parent | 35e295e2a161fcf146ea031de53431b2888521fa (diff) | |
| parent | 5b6cc97bf138293b6af12d5d3003bb66c700c48a (diff) | |
| download | openbmc-9722c6ee87766a45a337c094d1293de81cdcb106.tar.xz | |
Merge branch 'master' of ssh://git-amr-1.devtools.intel.com:29418/openbmc-openbmc into HEAD
Diffstat (limited to 'poky/meta/conf/machine/include/arm/feature-arm-thumb.inc')
| -rw-r--r-- | poky/meta/conf/machine/include/arm/feature-arm-thumb.inc | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/poky/meta/conf/machine/include/arm/feature-arm-thumb.inc b/poky/meta/conf/machine/include/arm/feature-arm-thumb.inc index 0b47ccad0..bae169da3 100644 --- a/poky/meta/conf/machine/include/arm/feature-arm-thumb.inc +++ b/poky/meta/conf/machine/include/arm/feature-arm-thumb.inc @@ -1,8 +1,6 @@ TUNEVALID[thumb] = "Support Thumb instructions" -ARM_THUMB_SUFFIX = "${@bb.utils.contains_any('TUNE_FEATURES', 'armv4 armv5 armv6', 't', 't2', d)}" - # If the device supports ARM, then respect ARM_THUMB_OPT (which can be "arm" or "thumb") # If the device doesn't support ARM, then always set "thumb" even when # some recipe explicitly sets ARM_INSTRUCTION_SET to "arm" @@ -23,6 +21,11 @@ python () { TUNE_CCARGS .= "${@bb.utils.contains('TUNE_FEATURES', 'thumb', ' -m${ARM_M_OPT}', '', d)}" +ARM_THUMB_SUFFIX = "t2" +ARM_THUMB_SUFFIX_armv4 = "t" +ARM_THUMB_SUFFIX_armv5 = "t" +ARM_THUMB_SUFFIX_armv6 = "t" + # Add suffix from ARM_THUMB_SUFFIX only if after all this we still set ARM_M_OPT to thumb ARMPKGSFX_THUMB .= "${@bb.utils.contains('TUNE_FEATURES', 'thumb', '${ARM_THUMB_SUFFIX}', '', d) if d.getVar('ARM_M_OPT') == 'thumb' else ''}" |