define RT_USING_RTT_CMSIS in rtconfig.h while using IAR 6.30+

git-svn-id: https://rt-thread.googlecode.com/svn/trunk@2174 bbd45198-f89e-11dd-88c7-29a3b14d5316

bsp/stm32f20x/Libraries/SConscript

@@ -7,7 +7,6 @@ cwd = GetCurrentDir()
 
 # The set of source files associated with this SConscript file.
 src = Split("""
-CMSIS/CM3/CoreSupport/core_cm3.c
 CMSIS/CM3/DeviceSupport/ST/STM32F2xx/system_stm32f2xx.c
 STM32F2xx_StdPeriph_Driver/src/misc.c
 STM32F2xx_StdPeriph_Driver/src/stm32f2xx_adc.c
@@ -54,9 +53,14 @@ elif rtconfig.CROSS_TOOL == 'iar':
     src = src + ['CMSIS/CM3/DeviceSupport/ST/STM32F2xx/startup/iar/' + startup_scripts]
 
 path = [cwd + '/STM32F2xx_StdPeriph_Driver/inc',
-    cwd + '/CMSIS/CM3/CoreSupport',
     cwd + '/CMSIS/CM3/DeviceSupport/ST/STM32F2xx']
 
+if GetDepend(['RT_USING_BSP_CMSIS']):
+    path += [cwd + '/CMSIS/CM3/CoreSupport']
+    src += [cwd + '/CMSIS/CM3/CoreSupport/core_cm3.c']
+elif GetDepend(['RT_USING_RTT_CMSIS']):
+    path += [RTT_ROOT + '/components/CMSIS/Include']
+
 if GetDepend('RT_USING_LWIP') == True:
 	src = src + ['STM32F2x7_ETH_Driver/src/stm32f2x7_eth.c']
 	path = path + [cwd + '/STM32F2x7_ETH_Driver/inc']

bsp/stm32f20x/rtconfig.h

@@ -131,4 +131,11 @@
 #define RT_LWIP_ETHTHREAD_MBOX_SIZE		4
 #define RT_LWIP_ETHTHREAD_STACKSIZE		512
 
+// <bool name="RT_USING_CMSIS_OS" description="Using CMSIS OS API" default="true" />
+// #define RT_USING_CMSIS_OS
+// <bool name="RT_USING_RTT_CMSIS" description="Using CMSIS in RTT" default="true" />
+#define RT_USING_RTT_CMSIS
+// <bool name="RT_USING_BSP_CMSIS" description="Using CMSIS in BSP" default="true" />
+// #define RT_USING_BSP_CMSIS
+
 #endif