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

diff --git a/meta/conf/machine/include/tune-arm1136jf-s.inc b/meta/conf/machine/include/tune-arm1136jf-s.inc
index a69df825c0864a9d938439e42ba642bfdd9210f3..812c5905a69406bd0d9d3f01ba392e7d26be1513 100644 (file)
--- 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