Skip to content

R
rt-thread

luozhenger / rt-thread
与 Fork 源项目一致

Fork自 RT-Thread / rt-thread

通知 1
Star 0
Fork 0
R
rt-thread

体验新版 GitCode，发现更多精彩内容 >>

提交 43f9962b 编写于 作者: D dzzxzz@gmail.com
浏览文件
操作

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
上级 6e7f8a36
隐藏空白更改
内联 并排
Showing with 183 addition and 88 deletion
bsp/stm32f20x/Libraries/SConscript
浏览文件 @ 43f9962b
......@@ -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/project.ewp
浏览文件 @ 43f9962b
......@@ -12,7 +12,7 @@
<name>General</name>
<archiveVersion>3</archiveVersion>
<data>
<version>20</version>
<version>21</version>
<wantNonLocal>1</wantNonLocal>
<debug>1</debug>
<option>
......@@ -29,7 +29,7 @@
</option>
<option>
<name>Variant</name>
<version>18</version>
<version>19</version>
<state>37</state>
</option>
<option>
......@@ -38,8 +38,8 @@
</option>
<option>
<name>Input variant</name>
<version>1</version>
<state>0</state>
<version>3</version>
<state>1</state>
</option>
<option>
<name>Input description</name>
......@@ -47,8 +47,8 @@
</option>
<option>
<name>Output variant</name>
<version>0</version>
<state>0</state>
<version>2</version>
<state>1</state>
</option>
<option>
<name>Output description</name>
......@@ -87,7 +87,7 @@
</option>
<option>
<name>OGLastSavedByProductVersion</name>
<state>6.10.1.52170</state>
<state>6.30.6.53380</state>
</option>
<option>
<name>GeneralEnableMisra</name>
......@@ -99,7 +99,7 @@
</option>
<option>
<name>OGChipSelectEditMenu</name>
<state>STM32F207xx ST STM32F207xx</state>
<state>STM32F207ZG ST STM32F207ZG</state>
</option>
<option>
<name>GenLowLevelInterface</name>
......@@ -137,21 +137,29 @@
</option>
<option>
<name>GFPUCoreSlave</name>
<version>18</version>
<version>19</version>
<state>37</state>
</option>
<option>
<name>GBECoreSlave</name>
<version>18</version>
<version>19</version>
<state>37</state>
</option>
<option>
<name>OGUseCmsis</name>
<state>0</state>
</option>
<option>
<name>OGUseCmsisDspLib</name>
<state>0</state>
</option>
</data>
</settings>
<settings>
<name>ICCARM</name>
<archiveVersion>2</archiveVersion>
<data>
<version>26</version>
<version>28</version>
<wantNonLocal>1</wantNonLocal>
<debug>1</debug>
<option>
......@@ -287,13 +295,15 @@
<option>
<name>CCIncludePath2</name>
<state></state>
<state>$PROJ_DIR$\..\..\include</state>
<state>$PROJ_DIR$\..\..\components\finsh</state>
<state>$PROJ_DIR$\drivers</state>
<state>$PROJ_DIR$\..\..\components\CMSIS\Include</state>
<state>$PROJ_DIR$\.</state>
<state>$PROJ_DIR$\..\..\include</state>
<state>$PROJ_DIR$\Libraries\CMSIS\CM3\CoreSupport</state>
<state>$PROJ_DIR$\Libraries\STM32F2xx_StdPeriph_Driver\inc</state>
<state>$PROJ_DIR$\applications</state>
<state>$PROJ_DIR$\..\..\libcpu\arm\cortex-m3</state>
<state>$PROJ_DIR$\..\..\libcpu\arm\common</state>
<state>$PROJ_DIR$\..\..\libcpu\arm\stm32</state>
<state>$PROJ_DIR$\Libraries\STM32F2xx_StdPeriph_Driver\inc</state>
<state>$PROJ_DIR$\Libraries\CMSIS\CM3\DeviceSupport\ST\STM32F2xx</state>
</option>
<option>
......@@ -376,11 +386,15 @@
<state>1</state>
</option>
<option>
<name>IccRelaxedFpPrecision</name>
<name>IccCppInlineSemantics</name>
<state>0</state>
</option>
<option>
<name>IccCppInlineSemantics</name>
<name>IccCmsis</name>
<state>1</state>
</option>
<option>
<name>IccFloatSemantics</name>
<state>0</state>
</option>
</data>
......@@ -602,7 +616,7 @@
<name>ILINK</name>
<archiveVersion>0</archiveVersion>
<data>
<version>11</version>
<version>14</version>
<wantNonLocal>1</wantNonLocal>
<debug>1</debug>
<option>
......@@ -848,6 +862,34 @@
<name>IlinkOptExceptionsForce</name>
<state>0</state>
</option>
<option>
<name>IlinkCmsis</name>
<state>1</state>
</option>
<option>
<name>IlinkOptMergeDuplSections</name>
<state>0</state>
</option>
<option>
<name>IlinkOptUseVfe</name>
<state>1</state>
</option>
<option>
<name>IlinkOptForceVfe</name>
<state>0</state>
</option>
<option>
<name>IlinkStackAnalysisEnable</name>
<state>0</state>
</option>
<option>
<name>IlinkStackControlFile</name>
<state></state>
</option>
<option>
<name>IlinkStackCallGraphFile</name>
<state></state>
</option>
</data>
</settings>
<settings>
......@@ -887,7 +929,7 @@
<name>General</name>
<archiveVersion>3</archiveVersion>
<data>
<version>20</version>
<version>21</version>
<wantNonLocal>1</wantNonLocal>
<debug>0</debug>
<option>
......@@ -904,7 +946,7 @@
</option>
<option>
<name>Variant</name>
<version>18</version>
<version>19</version>
<state>0</state>
</option>
<option>
......@@ -913,8 +955,8 @@
</option>
<option>
<name>Input variant</name>
<version>1</version>
<state>0</state>
<version>3</version>
<state>1</state>
</option>
<option>
<name>Input description</name>
......@@ -922,8 +964,8 @@
</option>
<option>
<name>Output variant</name>
<version>0</version>
<state>0</state>
<version>2</version>
<state>1</state>
</option>
<option>
<name>Output description</name>
......@@ -962,7 +1004,7 @@
</option>
<option>
<name>OGLastSavedByProductVersion</name>
<state></state>
<state>6.30.6.53380</state>
</option>
<option>
<name>GeneralEnableMisra</name>
......@@ -1012,12 +1054,20 @@
</option>
<option>
<name>GFPUCoreSlave</name>
<version>18</version>
<version>19</version>
<state>0</state>
</option>
<option>
<name>GBECoreSlave</name>
<version>18</version>
<version>19</version>
<state>0</state>
</option>
<option>
<name>OGUseCmsis</name>
<state>0</state>
</option>
<option>
<name>OGUseCmsisDspLib</name>
<state>0</state>
</option>
</data>
......@@ -1026,7 +1076,7 @@
<name>ICCARM</name>
<archiveVersion>2</archiveVersion>
<data>
<version>26</version>
<version>28</version>
<wantNonLocal>1</wantNonLocal>
<debug>0</debug>
<option>
......@@ -1162,13 +1212,15 @@
<option>
<name>CCIncludePath2</name>
<state></state>
<state>$PROJ_DIR$\..\..\include</state>
<state>$PROJ_DIR$\..\..\components\finsh</state>
<state>$PROJ_DIR$\drivers</state>
<state>$PROJ_DIR$\..\..\components\CMSIS\Include</state>
<state>$PROJ_DIR$\.</state>
<state>$PROJ_DIR$\..\..\include</state>
<state>$PROJ_DIR$\Libraries\CMSIS\CM3\CoreSupport</state>
<state>$PROJ_DIR$\Libraries\STM32F2xx_StdPeriph_Driver\inc</state>
<state>$PROJ_DIR$\applications</state>
<state>$PROJ_DIR$\..\..\libcpu\arm\cortex-m3</state>
<state>$PROJ_DIR$\..\..\libcpu\arm\common</state>
<state>$PROJ_DIR$\..\..\libcpu\arm\stm32</state>
<state>$PROJ_DIR$\Libraries\STM32F2xx_StdPeriph_Driver\inc</state>
<state>$PROJ_DIR$\Libraries\CMSIS\CM3\DeviceSupport\ST\STM32F2xx</state>
</option>
<option>
......@@ -1251,11 +1303,15 @@
<state>1</state>
</option>
<option>
<name>IccRelaxedFpPrecision</name>
<name>IccCppInlineSemantics</name>
<state>0</state>
</option>
<option>
<name>IccCppInlineSemantics</name>
<name>IccCmsis</name>
<state>1</state>
</option>
<option>
<name>IccFloatSemantics</name>
<state>0</state>
</option>
</data>
......@@ -1477,7 +1533,7 @@
<name>ILINK</name>
<archiveVersion>0</archiveVersion>
<data>
<version>11</version>
<version>14</version>
<wantNonLocal>1</wantNonLocal>
<debug>0</debug>
<option>
......@@ -1723,6 +1779,34 @@
<name>IlinkOptExceptionsForce</name>
<state>0</state>
</option>
<option>
<name>IlinkCmsis</name>
<state>1</state>
</option>
<option>
<name>IlinkOptMergeDuplSections</name>
<state>0</state>
</option>
<option>
<name>IlinkOptUseVfe</name>
<state>1</state>
</option>
<option>
<name>IlinkOptForceVfe</name>
<state>0</state>
</option>
<option>
<name>IlinkStackAnalysisEnable</name>
<state>0</state>
</option>
<option>
<name>IlinkStackControlFile</name>
<state></state>
</option>
<option>
<name>IlinkStackCallGraphFile</name>
<state></state>
</option>
</data>
</settings>
<settings>
......@@ -1753,142 +1837,142 @@
</settings>
</configuration>
<group>
<name>finsh</name>
<name>Applications</name>
<file>
<name>$PROJ_DIR$\..\..\components\finsh\cmd.c</name>
<name>$PROJ_DIR$\applications\application.c</name>
</file>
<file>
<name>$PROJ_DIR$\..\..\components\finsh\finsh_compiler.c</name>
<name>$PROJ_DIR$\applications\startup.c</name>
</file>
</group>
<group>
<name>CORTEX-M3</name>
<file>
<name>$PROJ_DIR$\..\..\components\finsh\finsh_error.c</name>
<name>$PROJ_DIR$\..\..\libcpu\arm\common\backtrace.c</name>
</file>
<file>
<name>$PROJ_DIR$\..\..\components\finsh\finsh_heap.c</name>
<name>$PROJ_DIR$\..\..\libcpu\arm\cortex-m3\context_iar.S</name>
</file>
<file>
<name>$PROJ_DIR$\..\..\components\finsh\finsh_init.c</name>
<name>$PROJ_DIR$\..\..\libcpu\arm\cortex-m3\cpuport.c</name>
</file>
<file>
<name>$PROJ_DIR$\..\..\components\finsh\finsh_node.c</name>
<name>$PROJ_DIR$\..\..\libcpu\arm\common\div0.c</name>
</file>
<file>
<name>$PROJ_DIR$\..\..\components\finsh\finsh_ops.c</name>
<name>$PROJ_DIR$\..\..\libcpu\arm\common\showmem.c</name>
</file>
</group>
<group>
<name>Drivers</name>
<file>
<name>$PROJ_DIR$\..\..\components\finsh\finsh_parser.c</name>
<name>$PROJ_DIR$\Drivers\24LCxx.c</name>
</file>
<file>
<name>$PROJ_DIR$\..\..\components\finsh\finsh_token.c</name>
<name>$PROJ_DIR$\Drivers\board.c</name>
</file>
<file>
<name>$PROJ_DIR$\..\..\components\finsh\finsh_var.c</name>
<name>$PROJ_DIR$\Drivers\FM25Lx.c</name>
</file>
<file>
<name>$PROJ_DIR$\..\..\components\finsh\finsh_vm.c</name>
<name>$PROJ_DIR$\Drivers\i2c.c</name>
</file>
<file>
<name>$PROJ_DIR$\..\..\components\finsh\shell.c</name>
<name>$PROJ_DIR$\Drivers\rtc.c</name>
</file>
<file>
<name>$PROJ_DIR$\..\..\components\finsh\symbol.c</name>
<name>$PROJ_DIR$\Drivers\serial.c</name>
</file>
</group>
<group>
<name>Kernel</name>
<file>
<name>$PROJ_DIR$\..\..\src\clock.c</name>
<name>$PROJ_DIR$\Drivers\stm32f2xx_it.c</name>
</file>
<file>
<name>$PROJ_DIR$\..\..\src\device.c</name>
<name>$PROJ_DIR$\Drivers\usart.c</name>
</file>
</group>
<group>
<name>finsh</name>
<file>
<name>$PROJ_DIR$\..\..\src\idle.c</name>
<name>$PROJ_DIR$\..\..\components\finsh\cmd.c</name>
</file>
<file>
<name>$PROJ_DIR$\..\..\src\ipc.c</name>
<name>$PROJ_DIR$\..\..\components\finsh\finsh_compiler.c</name>
</file>
<file>
<name>$PROJ_DIR$\..\..\src\irq.c</name>
<name>$PROJ_DIR$\..\..\components\finsh\finsh_error.c</name>
</file>
<file>
<name>$PROJ_DIR$\..\..\src\kservice.c</name>
<name>$PROJ_DIR$\..\..\components\finsh\finsh_heap.c</name>
</file>
<file>
<name>$PROJ_DIR$\..\..\src\mem.c</name>
<name>$PROJ_DIR$\..\..\components\finsh\finsh_init.c</name>
</file>
<file>
<name>$PROJ_DIR$\..\..\src\mempool.c</name>
<name>$PROJ_DIR$\..\..\components\finsh\finsh_node.c</name>
</file>
<file>
<name>$PROJ_DIR$\..\..\src\module.c</name>
<name>$PROJ_DIR$\..\..\components\finsh\finsh_ops.c</name>
</file>
<file>
<name>$PROJ_DIR$\..\..\src\object.c</name>
<name>$PROJ_DIR$\..\..\components\finsh\finsh_parser.c</name>
</file>
<file>
<name>$PROJ_DIR$\..\..\src\rtm.c</name>
<name>$PROJ_DIR$\..\..\components\finsh\finsh_token.c</name>
</file>
<file>
<name>$PROJ_DIR$\..\..\src\scheduler.c</name>
<name>$PROJ_DIR$\..\..\components\finsh\finsh_var.c</name>
</file>
<file>
<name>$PROJ_DIR$\..\..\src\slab.c</name>
<name>$PROJ_DIR$\..\..\components\finsh\finsh_vm.c</name>
</file>
<file>
<name>$PROJ_DIR$\..\..\src\thread.c</name>
<name>$PROJ_DIR$\..\..\components\finsh\shell.c</name>
</file>
<file>
<name>$PROJ_DIR$\..\..\src\timer.c</name>
<name>$PROJ_DIR$\..\..\components\finsh\symbol.c</name>
</file>
</group>
<group>
<name>Startup</name>
<name>Kernel</name>
<file>
<name>$PROJ_DIR$\.\application.c</name>
<name>$PROJ_DIR$\..\..\src\clock.c</name>
</file>
<file>
<name>$PROJ_DIR$\.\board.c</name>
<name>$PROJ_DIR$\..\..\src\device.c</name>
</file>
<file>
<name>$PROJ_DIR$\rtc.c</name>
<name>$PROJ_DIR$\..\..\src\idle.c</name>
</file>
<file>
<name>$PROJ_DIR$\.\serial.c</name>
<name>$PROJ_DIR$\..\..\src\ipc.c</name>
</file>
<file>
<name>$PROJ_DIR$\.\startup.c</name>
<name>$PROJ_DIR$\..\..\src\irq.c</name>
</file>
<file>
<name>$PROJ_DIR$\.\stm32f20x_it.c</name>
<name>$PROJ_DIR$\..\..\src\kservice.c</name>
</file>
<file>
<name>$PROJ_DIR$\.\usart.c</name>
<name>$PROJ_DIR$\..\..\src\mem.c</name>
</file>
</group>
<group>
<name>STM32</name>
<file>
<name>$PROJ_DIR$\..\..\libcpu\arm\common\backtrace.c</name>
<name>$PROJ_DIR$\..\..\src\mempool.c</name>
</file>
<file>
<name>$PROJ_DIR$\..\..\libcpu\arm\cortex-m3\context_iar.S</name>
<name>$PROJ_DIR$\..\..\src\object.c</name>
</file>
<file>
<name>$PROJ_DIR$\..\..\libcpu\arm\cortex-m3\cpuport.c</name>
<name>$PROJ_DIR$\..\..\src\scheduler.c</name>
</file>
<file>
<name>$PROJ_DIR$\..\..\libcpu\arm\common\div0.c</name>
<name>$PROJ_DIR$\..\..\src\thread.c</name>
</file>
<file>
<name>$PROJ_DIR$\..\..\libcpu\arm\common\showmem.c</name>
<name>$PROJ_DIR$\..\..\src\timer.c</name>
</file>
</group>
<group>
<name>STM32_StdPeriph</name>
<file>
<name>$PROJ_DIR$\Libraries\CMSIS\CM3\CoreSupport\core_cm3.c</name>
</file>
<file>
<name>$PROJ_DIR$\Libraries\STM32F2xx_StdPeriph_Driver\src\misc.c</name>
</file>
......
bsp/stm32f20x/rtconfig.h
浏览文件 @ 43f9962b
......@@ -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
Markdown is supported
0% 或 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑！
想要评论请 注册 或