Skip to content

R
rt-thread

天中雨水 / rt-thread
该项目与 Fork 源项目分叉

Fork自 RT-Thread / rt-thread

通知 2
Star 1
Fork 0
R
rt-thread

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

提交 efeb6231 编写于 作者: 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@2170 bbd45198-f89e-11dd-88c7-29a3b14d5316
上级 0fde4d77
展开全部 隐藏空白更改
内联 并排
Showing with 2247 addition and 452 deletion
bsp/stm32f107/Libraries/SConscript
浏览文件 @ efeb6231
......@@ -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/STM32F10x/system_stm32f10x.c
STM32F10x_StdPeriph_Driver/src/stm32f10x_crc.c
STM32F10x_StdPeriph_Driver/src/stm32f10x_rcc.c
......@@ -54,9 +53,14 @@ elif rtconfig.CROSS_TOOL == 'iar':
src = src + ['CMSIS/CM3/DeviceSupport/ST/STM32F10x/startup/iar/' + startup_scripts[rtconfig.STM32_TYPE]]
path = [cwd + '/STM32F10x_StdPeriph_Driver/inc',
cwd + '/CMSIS/CM3/CoreSupport',
cwd + '/CMSIS/CM3/DeviceSupport/ST/STM32F10x']
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']
CPPDEFINES = ['USE_STDPERIPH_DRIVER', rtconfig.STM32_TYPE]
group = DefineGroup('STM32_StdPeriph', src, depend = [''], CPPPATH = path, CPPDEFINES = CPPDEFINES)
......
bsp/stm32f107/project.ewp
浏览文件 @ efeb6231
......@@ -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.3.52260</state>
<state>6.30.6.53380</state>
</option>
<option>
<name>GeneralEnableMisra</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>
......@@ -289,20 +297,20 @@
<name>CCIncludePath2</name>
<state></state>
<state>$PROJ_DIR$\Libraries\STM32F10x_StdPeriph_Driver\inc</state>
<state>$PROJ_DIR$\Libraries\CMSIS\CM3\CoreSupport</state>
<state>$PROJ_DIR$\..\..\components\dfs</state>
<state>$PROJ_DIR$\..\..\components\finsh</state>
<state>$PROJ_DIR$\..\..\include</state>
<state>$PROJ_DIR$\..\..\components\net\lwip\src\include</state>
<state>$PROJ_DIR$\..\..\components\CMSIS\Include</state>
<state>$PROJ_DIR$\.</state>
<state>$PROJ_DIR$\..\..\components\net\lwip\src\include\ipv4</state>
<state>$PROJ_DIR$\..\..\include</state>
<state>$PROJ_DIR$\..\..\components\dfs</state>
<state>$PROJ_DIR$\..\..\components\net\lwip\src\arch\include</state>
<state>$PROJ_DIR$\..\..\components\dfs\include</state>
<state>$PROJ_DIR$\..\..\libcpu\arm\cortex-m3</state>
<state>$PROJ_DIR$\..\..\components\net\lwip\src</state>
<state>$PROJ_DIR$\..\..\libcpu\arm\common</state>
<state>$PROJ_DIR$\..\..\libcpu\arm\stm32</state>
<state>$PROJ_DIR$\..\..\components\net\lwip\src\include\netif</state>
<state>$PROJ_DIR$\Libraries\CMSIS\CM3\DeviceSupport\ST\STM32F10x</state>
<state>$PROJ_DIR$\..\..\components\finsh</state>
<state>$PROJ_DIR$\..\..\components\net\lwip\src\include\netif</state>
<state>$PROJ_DIR$\..\..\components\dfs\include</state>
</option>
<option>
<name>CCStdIncCheck</name>
......@@ -384,11 +392,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>
......@@ -610,7 +622,7 @@
<name>ILINK</name>
<archiveVersion>0</archiveVersion>
<data>
<version>11</version>
<version>14</version>
<wantNonLocal>1</wantNonLocal>
<debug>1</debug>
<option>
......@@ -856,6 +868,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>
......@@ -895,7 +935,7 @@
<name>General</name>
<archiveVersion>3</archiveVersion>
<data>
<version>20</version>
<version>21</version>
<wantNonLocal>1</wantNonLocal>
<debug>0</debug>
<option>
......@@ -912,7 +952,7 @@
</option>
<option>
<name>Variant</name>
<version>18</version>
<version>19</version>
<state>0</state>
</option>
<option>
......@@ -921,8 +961,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>
......@@ -930,8 +970,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>
......@@ -970,7 +1010,7 @@
</option>
<option>
<name>OGLastSavedByProductVersion</name>
<state></state>
<state>6.30.6.53380</state>
</option>
<option>
<name>GeneralEnableMisra</name>
......@@ -1020,12 +1060,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>
......@@ -1034,7 +1082,7 @@
<name>ICCARM</name>
<archiveVersion>2</archiveVersion>
<data>
<version>26</version>
<version>28</version>
<wantNonLocal>1</wantNonLocal>
<debug>0</debug>
<option>
......@@ -1172,20 +1220,20 @@
<name>CCIncludePath2</name>
<state></state>
<state>$PROJ_DIR$\Libraries\STM32F10x_StdPeriph_Driver\inc</state>
<state>$PROJ_DIR$\Libraries\CMSIS\CM3\CoreSupport</state>
<state>$PROJ_DIR$\..\..\components\dfs</state>
<state>$PROJ_DIR$\..\..\components\finsh</state>
<state>$PROJ_DIR$\..\..\include</state>
<state>$PROJ_DIR$\..\..\components\net\lwip\src\include</state>
<state>$PROJ_DIR$\..\..\components\CMSIS\Include</state>
<state>$PROJ_DIR$\.</state>
<state>$PROJ_DIR$\..\..\components\net\lwip\src\include\ipv4</state>
<state>$PROJ_DIR$\..\..\include</state>
<state>$PROJ_DIR$\..\..\components\dfs</state>
<state>$PROJ_DIR$\..\..\components\net\lwip\src\arch\include</state>
<state>$PROJ_DIR$\..\..\components\dfs\include</state>
<state>$PROJ_DIR$\..\..\libcpu\arm\cortex-m3</state>
<state>$PROJ_DIR$\..\..\components\net\lwip\src</state>
<state>$PROJ_DIR$\..\..\libcpu\arm\common</state>
<state>$PROJ_DIR$\..\..\libcpu\arm\stm32</state>
<state>$PROJ_DIR$\..\..\components\net\lwip\src\include\netif</state>
<state>$PROJ_DIR$\Libraries\CMSIS\CM3\DeviceSupport\ST\STM32F10x</state>
<state>$PROJ_DIR$\..\..\components\finsh</state>
<state>$PROJ_DIR$\..\..\components\net\lwip\src\include\netif</state>
<state>$PROJ_DIR$\..\..\components\dfs\include</state>
</option>
<option>
<name>CCStdIncCheck</name>
......@@ -1267,11 +1315,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>
......@@ -1493,7 +1545,7 @@
<name>ILINK</name>
<archiveVersion>0</archiveVersion>
<data>
<version>11</version>
<version>14</version>
<wantNonLocal>1</wantNonLocal>
<debug>0</debug>
<option>
......@@ -1739,6 +1791,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>
......@@ -1768,6 +1848,24 @@
<data/>
</settings>
</configuration>
<group>
<name>CORTEX-M3</name>
<file>
<name>$PROJ_DIR$\..\..\libcpu\arm\common\backtrace.c</name>
</file>
<file>
<name>$PROJ_DIR$\..\..\libcpu\arm\cortex-m3\context_iar.S</name>
</file>
<file>
<name>$PROJ_DIR$\..\..\libcpu\arm\cortex-m3\cpuport.c</name>
</file>
<file>
<name>$PROJ_DIR$\..\..\libcpu\arm\common\div0.c</name>
</file>
<file>
<name>$PROJ_DIR$\..\..\libcpu\arm\common\showmem.c</name>
</file>
</group>
<group>
<name>Filesystem</name>
<file>
......@@ -1857,21 +1955,12 @@
<file>
<name>$PROJ_DIR$\..\..\src\mempool.c</name>
</file>
<file>
<name>$PROJ_DIR$\..\..\src\module.c</name>
</file>
<file>
<name>$PROJ_DIR$\..\..\src\object.c</name>
</file>
<file>
<name>$PROJ_DIR$\..\..\src\rtm.c</name>
</file>
<file>
<name>$PROJ_DIR$\..\..\src\scheduler.c</name>
</file>
<file>
<name>$PROJ_DIR$\..\..\src\slab.c</name>
</file>
<file>
<name>$PROJ_DIR$\..\..\src\thread.c</name>
</file>
......@@ -2014,29 +2103,8 @@
<name>$PROJ_DIR$\.\usart.c</name>
</file>
</group>
<group>
<name>STM32</name>
<file>
<name>$PROJ_DIR$\..\..\libcpu\arm\common\backtrace.c</name>
</file>
<file>
<name>$PROJ_DIR$\..\..\libcpu\arm\cortex-m3\context_iar.S</name>
</file>
<file>
<name>$PROJ_DIR$\..\..\libcpu\arm\cortex-m3\cpuport.c</name>
</file>
<file>
<name>$PROJ_DIR$\..\..\libcpu\arm\common\div0.c</name>
</file>
<file>
<name>$PROJ_DIR$\..\..\libcpu\arm\common\showmem.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\STM32F10x_StdPeriph_Driver\src\misc.c</name>
</file>
......
bsp/stm32f107/rtconfig.h
浏览文件 @ efeb6231
......@@ -147,4 +147,11 @@
#define CHECKSUM_GEN_IP 0
#define CHECKSUM_GEN_UDP 0
// <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
bsp/stm32f10x/Libraries/SConscript
浏览文件 @ efeb6231
......@@ -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/STM32F10x/system_stm32f10x.c
STM32F10x_StdPeriph_Driver/src/stm32f10x_crc.c
STM32F10x_StdPeriph_Driver/src/stm32f10x_rcc.c
......@@ -54,9 +53,14 @@ elif rtconfig.CROSS_TOOL == 'iar':
src = src + ['CMSIS/CM3/DeviceSupport/ST/STM32F10x/startup/iar/' + startup_scripts[rtconfig.STM32_TYPE]]
path = [cwd + '/STM32F10x_StdPeriph_Driver/inc',
cwd + '/CMSIS/CM3/CoreSupport',
cwd + '/CMSIS/CM3/DeviceSupport/ST/STM32F10x']
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']
CPPDEFINES = ['USE_STDPERIPH_DRIVER', rtconfig.STM32_TYPE]
group = DefineGroup('STM32_StdPeriph', src, depend = [''], CPPPATH = path, CPPDEFINES = CPPDEFINES)
......
bsp/stm32f10x/project.ewp
浏览文件 @ efeb6231
此差异已折叠。
bsp/stm32f10x/rtconfig.h
浏览文件 @ efeb6231
......@@ -169,4 +169,11 @@
/* #define RTGUI_IMAGE_XPM */
/* #define RTGUI_IMAGE_BMP */
// <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.
先完成此消息的编辑！
想要评论请 注册 或