summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarcin Juszkiewicz <hrw@openedhand.com>2007-12-19 12:02:43 +0000
committerMarcin Juszkiewicz <hrw@openedhand.com>2007-12-19 12:02:43 +0000
commitbb6d77b5a74365988b09911ab72b579bf7dbf585 (patch)
tree610427bf214bad9310134495943e9681b480cbf6
parent994be9eaf4ff1c4911451ccdea9346f2a4d345af (diff)
downloadopenembedded-core-bb6d77b5a74365988b09911ab72b579bf7dbf585.tar.gz
openembedded-core-bb6d77b5a74365988b09911ab72b579bf7dbf585.tar.bz2
openembedded-core-bb6d77b5a74365988b09911ab72b579bf7dbf585.zip
tune-arm1136jf-s: switch to use CPU_FEATURES to enable/disable VFP and Thumb support
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@3357 311d38ba-8fff-0310-9ca6-ca027cbcb966
-rw-r--r--meta/conf/machine/include/tune-arm1136jf-s.inc7
1 files changed, 6 insertions, 1 deletions
diff --git a/meta/conf/machine/include/tune-arm1136jf-s.inc b/meta/conf/machine/include/tune-arm1136jf-s.inc
index a69df825c0..812c5905a6 100644
--- a/meta/conf/machine/include/tune-arm1136jf-s.inc
+++ b/meta/conf/machine/include/tune-arm1136jf-s.inc
@@ -1,3 +1,8 @@
-TARGET_CC_ARCH = "-march=armv6j -mtune=arm1136jf-s -mfpu=vfp -mfloat-abi=softfp"
+TARGET_CC_ARCH = "-march=armv6j -mtune=arm1136jf-s"
+TARGET_CC_ARCH += "${@['', '-mfloat-abi=softfp -mfpu=vfp'][(bb.data.getVar('TARGET_FPU', d, 1) == 'soft') and (bb.data.getVar('CPU_FEATURES', d, 1).find('vfp') != -1)]}"
FEED_ARCH = "armv6"
PACKAGE_ARCH = "armv6"
+
+ARM_INSTRUCTION_SET = "${@['arm', 'thumb'][bb.data.getVar('CPU_FEATURES', d, 1).find('thumb') != 1]}"
+
+require conf/machine/include/tune-thumb.inc