libs/rt-thread
libs
/
rt-thread
4
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #3136 from whj4674672/master 

[bsp][stm32h7]Fix BUG that cannot run in IAR environment
This commit is contained in:
Bernard Xiong 2019-10-16 16:45:49 +08:00 committed by GitHub
parent c6d1474f2b ac1ab2d140
commit 2e0ab5e353
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 289 additions and 67 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
bsp/stm32/libraries/templates/stm32h7xx/board/linker_scripts/link.icf
View File

@ -7,7 +7,7 @@ define symbol __ICFEDIT_intvec_start__ = 0x08000000;
define symbol __ICFEDIT_region_ROM_start__ = 0x08000000;
define symbol __ICFEDIT_region_ROM_end__ = 0x081FFFFF;
define symbol __ICFEDIT_region_RAM_start__ = 0x24000000;
define symbol __ICFEDIT_region_RAM_end__ = 0x2007FFFF;
define symbol __ICFEDIT_region_RAM_end__ = 0x2407FFFF;
/*-Sizes-*/
define symbol __ICFEDIT_size_cstack__ = 0x0400;
define symbol __ICFEDIT_size_heap__ = 0x0000;

117
bsp/stm32/libraries/templates/stm32h7xx/template.ewp
View File

@ -11,7 +11,7 @@
<name>General</name>
<archiveVersion>3</archiveVersion>
<data>
<version>29</version>
<version>31</version>
<wantNonLocal>1</wantNonLocal>
<debug>1</debug>
<option>
@ -66,7 +66,7 @@
</option>
<option>
<name>OGLastSavedByProductVersion</name>
<state>8.11.3.13977</state>
<state>8.40.1.21529</state>
</option>
<option>
<name>GeneralEnableMisra</name>
@ -78,7 +78,7 @@
</option>
<option>
<name>OGChipSelectEditMenu</name>
<state>STM32F407ZG ST STM32F407ZG</state>
<state>STM32H743II ST STM32H743II</state>
</option>
<option>
<name>GenLowLevelInterface</name>
@ -112,12 +112,12 @@
</option>
<option>
<name>RTConfigPath2</name>
<state>$TOOLKIT_DIR$\INC\c\DLib_Config_Normal.h</state>
<state>$TOOLKIT_DIR$\inc\c\DLib_Config_Normal.h</state>
</option>
<option>
<name>GBECoreSlave</name>
<version>25</version>
<state>39</state>
<version>27</version>
<state>41</state>
</option>
<option>
<name>OGUseCmsis</name>
@ -133,22 +133,22 @@
</option>
<option>
<name>CoreVariant</name>
<version>25</version>
<state>39</state>
<version>27</version>
<state>41</state>
</option>
<option>
<name>GFPUDeviceSlave</name>
<state>STM32F407ZG ST STM32F407ZG</state>
<state>STM32H743II ST STM32H743II</state>
</option>
<option>
<name>FPU2</name>
<version>0</version>
<state>4</state>
<state>0</state>
</option>
<option>
<name>NrRegs</name>
<version>0</version>
<state>1</state>
<state>0</state>
</option>
<option>
<name>NEON</name>
@ -156,8 +156,8 @@
</option>
<option>
<name>GFPUCoreSlave2</name>
<version>25</version>
<state>39</state>
<version>27</version>
<state>41</state>
</option>
<option>
<name>OGCMSISPackSelectDevice</name>
@ -200,13 +200,22 @@
<name>DSPExtension</name>
<state>1</state>
</option>
<option>
<name>TrustZone</name>
<state>0</state>
</option>
<option>
<name>TrustZoneModes</name>
<version>0</version>
<state>0</state>
</option>
</data>
</settings>
<settings>
<name>ICCARM</name>
<archiveVersion>2</archiveVersion>
<data>
<version>34</version>
<version>35</version>
<wantNonLocal>1</wantNonLocal>
<debug>1</debug>
<option>
@ -454,6 +463,10 @@
<name>IccRTTI2</name>
<state>0</state>
</option>
<option>
<name>OICompilerExtraOption</name>
<state>1</state>
</option>
</data>
</settings>
<settings>
@ -674,7 +687,7 @@
<name>ILINK</name>
<archiveVersion>0</archiveVersion>
<data>
<version>20</version>
<version>23</version>
<wantNonLocal>1</wantNonLocal>
<debug>1</debug>
<option>
@ -986,6 +999,30 @@
<name>IlinkLocaleSelect</name>
<state>1</state>
</option>
<option>
<name>IlinkTrustzoneImportLibraryOut</name>
<state>###Unitialized###</state>
</option>
<option>
<name>OILinkExtraOption</name>
<state>1</state>
</option>
<option>
<name>IlinkRawBinaryFile2</name>
<state></state>
</option>
<option>
<name>IlinkRawBinarySymbol2</name>
<state></state>
</option>
<option>
<name>IlinkRawBinarySegment2</name>
<state></state>
</option>
<option>
<name>IlinkRawBinaryAlign2</name>
<state></state>
</option>
</data>
</settings>
<settings>
@ -1025,7 +1062,7 @@
<name>General</name>
<archiveVersion>3</archiveVersion>
<data>
<version>29</version>
<version>31</version>
<wantNonLocal>1</wantNonLocal>
<debug>0</debug>
<option>
@ -1130,7 +1167,7 @@
</option>
<option>
<name>GBECoreSlave</name>
<version>25</version>
<version>27</version>
<state>1</state>
</option>
<option>
@ -1147,7 +1184,7 @@
</option>
<option>
<name>CoreVariant</name>
<version>25</version>
<version>27</version>
<state>0</state>
</option>
<option>
@ -1170,7 +1207,7 @@
</option>
<option>
<name>GFPUCoreSlave2</name>
<version>25</version>
<version>27</version>
<state>0</state>
</option>
<option>
@ -1214,13 +1251,22 @@
<name>DSPExtension</name>
<state>0</state>
</option>
<option>
<name>TrustZone</name>
<state>0</state>
</option>
<option>
<name>TrustZoneModes</name>
<version>0</version>
<state>0</state>
</option>
</data>
</settings>
<settings>
<name>ICCARM</name>
<archiveVersion>2</archiveVersion>
<data>
<version>34</version>
<version>35</version>
<wantNonLocal>1</wantNonLocal>
<debug>0</debug>
<option>
@ -1229,6 +1275,7 @@
</option>
<option>
<name>CCDefines</name>
<state></state>
</option>
<option>
<name>CCPreprocFile</name>
@ -1467,6 +1514,10 @@
<name>IccRTTI2</name>
<state>0</state>
</option>
<option>
<name>OICompilerExtraOption</name>
<state>1</state>
</option>
</data>
</settings>
<settings>
@ -1687,7 +1738,7 @@
<name>ILINK</name>
<archiveVersion>0</archiveVersion>
<data>
<version>20</version>
<version>23</version>
<wantNonLocal>1</wantNonLocal>
<debug>0</debug>
<option>
@ -1999,6 +2050,30 @@
<name>IlinkLocaleSelect</name>
<state>1</state>
</option>
<option>
<name>IlinkTrustzoneImportLibraryOut</name>
<state>###Unitialized###</state>
</option>
<option>
<name>OILinkExtraOption</name>
<state>1</state>
</option>
<option>
<name>IlinkRawBinaryFile2</name>
<state></state>
</option>
<option>
<name>IlinkRawBinarySymbol2</name>
<state></state>
</option>
<option>
<name>IlinkRawBinarySegment2</name>
<state></state>
</option>
<option>
<name>IlinkRawBinaryAlign2</name>
<state></state>
</option>
</data>
</settings>
<settings>

2
bsp/stm32/stm32h743-atk-apollo/board/linker_scripts/link.icf
View File

@ -7,7 +7,7 @@ define symbol __ICFEDIT_intvec_start__ = 0x08000000;
define symbol __ICFEDIT_region_ROM_start__ = 0x08000000;
define symbol __ICFEDIT_region_ROM_end__ = 0x081FFFFF;
define symbol __ICFEDIT_region_RAM_start__ = 0x24000000;
define symbol __ICFEDIT_region_RAM_end__ = 0x2007FFFF;
define symbol __ICFEDIT_region_RAM_end__ = 0x2407FFFF;
/*-Sizes-*/
define symbol __ICFEDIT_size_cstack__ = 0x0400;
define symbol __ICFEDIT_size_heap__ = 0x0000;

118
bsp/stm32/stm32h743-atk-apollo/project.ewp
View File

@ -10,7 +10,7 @@
<name>General</name>
<archiveVersion>3</archiveVersion>
<data>
<version>29</version>
<version>31</version>
<wantNonLocal>1</wantNonLocal>
<debug>1</debug>
<option>
@ -65,7 +65,7 @@
</option>
<option>
<name>OGLastSavedByProductVersion</name>
<state>8.11.3.13977</state>
<state>8.40.1.21529</state>
</option>
<option>
<name>GeneralEnableMisra</name>
@ -77,7 +77,7 @@
</option>
<option>
<name>OGChipSelectEditMenu</name>
<state>STM32F407ZG ST STM32F407ZG</state>
<state>STM32H743II ST STM32H743II</state>
</option>
<option>
<name>GenLowLevelInterface</name>
@ -111,12 +111,12 @@
</option>
<option>
<name>RTConfigPath2</name>
<state>$TOOLKIT_DIR$\INC\c\DLib_Config_Normal.h</state>
<state>$TOOLKIT_DIR$\inc\c\DLib_Config_Normal.h</state>
</option>
<option>
<name>GBECoreSlave</name>
<version>25</version>
<state>39</state>
<version>27</version>
<state>41</state>
</option>
<option>
<name>OGUseCmsis</name>
@ -132,17 +132,17 @@
</option>
<option>
<name>CoreVariant</name>
<version>25</version>
<state>39</state>
<version>27</version>
<state>41</state>
</option>
<option>
<name>GFPUDeviceSlave</name>
<state>STM32F407ZG ST STM32F407ZG</state>
<state>STM32H743II ST STM32H743II</state>
</option>
<option>
<name>FPU2</name>
<version>0</version>
<state>4</state>
<state>7</state>
</option>
<option>
<name>NrRegs</name>
@ -155,8 +155,8 @@
</option>
<option>
<name>GFPUCoreSlave2</name>
<version>25</version>
<state>39</state>
<version>27</version>
<state>41</state>
</option>
<option>
<name>OGCMSISPackSelectDevice</name>
@ -199,13 +199,22 @@
<name>DSPExtension</name>
<state>1</state>
</option>
<option>
<name>TrustZone</name>
<state>0</state>
</option>
<option>
<name>TrustZoneModes</name>
<version>0</version>
<state>0</state>
</option>
</data>
</settings>
<settings>
<name>ICCARM</name>
<archiveVersion>2</archiveVersion>
<data>
<version>34</version>
<version>35</version>
<wantNonLocal>1</wantNonLocal>
<debug>1</debug>
<option>
@ -470,6 +479,10 @@
<name>IccRTTI2</name>
<state>0</state>
</option>
<option>
<name>OICompilerExtraOption</name>
<state>1</state>
</option>
</data>
</settings>
<settings>
@ -690,7 +703,7 @@
<name>ILINK</name>
<archiveVersion>0</archiveVersion>
<data>
<version>20</version>
<version>23</version>
<wantNonLocal>1</wantNonLocal>
<debug>1</debug>
<option>
@ -1002,6 +1015,30 @@
<name>IlinkLocaleSelect</name>
<state>1</state>
</option>
<option>
<name>IlinkTrustzoneImportLibraryOut</name>
<state>###Unitialized###</state>
</option>
<option>
<name>OILinkExtraOption</name>
<state>1</state>
</option>
<option>
<name>IlinkRawBinaryFile2</name>
<state />
</option>
<option>
<name>IlinkRawBinarySymbol2</name>
<state />
</option>
<option>
<name>IlinkRawBinarySegment2</name>
<state />
</option>
<option>
<name>IlinkRawBinaryAlign2</name>
<state />
</option>
</data>
</settings>
<settings>
@ -1041,7 +1078,7 @@
<name>General</name>
<archiveVersion>3</archiveVersion>
<data>
<version>29</version>
<version>31</version>
<wantNonLocal>1</wantNonLocal>
<debug>0</debug>
<option>
@ -1146,7 +1183,7 @@
</option>
<option>
<name>GBECoreSlave</name>
<version>25</version>
<version>27</version>
<state>1</state>
</option>
<option>
@ -1163,7 +1200,7 @@
</option>
<option>
<name>CoreVariant</name>
<version>25</version>
<version>27</version>
<state>0</state>
</option>
<option>
@ -1186,7 +1223,7 @@
</option>
<option>
<name>GFPUCoreSlave2</name>
<version>25</version>
<version>27</version>
<state>0</state>
</option>
<option>
@ -1230,13 +1267,22 @@
<name>DSPExtension</name>
<state>0</state>
</option>
<option>
<name>TrustZone</name>
<state>0</state>
</option>
<option>
<name>TrustZoneModes</name>
<version>0</version>
<state>0</state>
</option>
</data>
</settings>
<settings>
<name>ICCARM</name>
<archiveVersion>2</archiveVersion>
<data>
<version>34</version>
<version>35</version>
<wantNonLocal>1</wantNonLocal>
<debug>0</debug>
<option>
@ -1245,6 +1291,7 @@
</option>
<option>
<name>CCDefines</name>
<state />
<state>STM32H743xx</state>
<state>USE_HAL_DRIVER</state>
</option>
@ -1500,6 +1547,10 @@
<name>IccRTTI2</name>
<state>0</state>
</option>
<option>
<name>OICompilerExtraOption</name>
<state>1</state>
</option>
</data>
</settings>
<settings>
@ -1720,7 +1771,7 @@
<name>ILINK</name>
<archiveVersion>0</archiveVersion>
<data>
<version>20</version>
<version>23</version>
<wantNonLocal>1</wantNonLocal>
<debug>0</debug>
<option>
@ -2032,6 +2083,30 @@
<name>IlinkLocaleSelect</name>
<state>1</state>
</option>
<option>
<name>IlinkTrustzoneImportLibraryOut</name>
<state>###Unitialized###</state>
</option>
<option>
<name>OILinkExtraOption</name>
<state>1</state>
</option>
<option>
<name>IlinkRawBinaryFile2</name>
<state />
</option>
<option>
<name>IlinkRawBinarySymbol2</name>
<state />
</option>
<option>
<name>IlinkRawBinarySegment2</name>
<state />
</option>
<option>
<name>IlinkRawBinaryAlign2</name>
<state />
</option>
</data>
</settings>
<settings>
@ -2069,9 +2144,6 @@
<file>
<name>$PROJ_DIR$\..\..\..\src\components.c</name>
</file>
<file>
<name>$PROJ_DIR$\..\..\..\src\cpu.c</name>
</file>
<file>
<name>$PROJ_DIR$\..\..\..\src\device.c</name>
</file>

115
bsp/stm32/stm32h743-atk-apollo/template.ewp
View File

@ -11,7 +11,7 @@
<name>General</name>
<archiveVersion>3</archiveVersion>
<data>
<version>29</version>
<version>31</version>
<wantNonLocal>1</wantNonLocal>
<debug>1</debug>
<option>
@ -66,7 +66,7 @@
</option>
<option>
<name>OGLastSavedByProductVersion</name>
<state>8.11.3.13977</state>
<state>8.40.1.21529</state>
</option>
<option>
<name>GeneralEnableMisra</name>
@ -78,7 +78,7 @@
</option>
<option>
<name>OGChipSelectEditMenu</name>
<state>STM32F407ZG ST STM32F407ZG</state>
<state>STM32H743II ST STM32H743II</state>
</option>
<option>
<name>GenLowLevelInterface</name>
@ -112,12 +112,12 @@
</option>
<option>
<name>RTConfigPath2</name>
<state>$TOOLKIT_DIR$\INC\c\DLib_Config_Normal.h</state>
<state>$TOOLKIT_DIR$\inc\c\DLib_Config_Normal.h</state>
</option>
<option>
<name>GBECoreSlave</name>
<version>25</version>
<state>39</state>
<version>27</version>
<state>41</state>
</option>
<option>
<name>OGUseCmsis</name>
@ -133,17 +133,17 @@
</option>
<option>
<name>CoreVariant</name>
<version>25</version>
<state>39</state>
<version>27</version>
<state>41</state>
</option>
<option>
<name>GFPUDeviceSlave</name>
<state>STM32F407ZG ST STM32F407ZG</state>
<state>STM32H743II ST STM32H743II</state>
</option>
<option>
<name>FPU2</name>
<version>0</version>
<state>4</state>
<state>7</state>
</option>
<option>
<name>NrRegs</name>
@ -156,8 +156,8 @@
</option>
<option>
<name>GFPUCoreSlave2</name>
<version>25</version>
<state>39</state>
<version>27</version>
<state>41</state>
</option>
<option>
<name>OGCMSISPackSelectDevice</name>
@ -200,13 +200,22 @@
<name>DSPExtension</name>
<state>1</state>
</option>
<option>
<name>TrustZone</name>
<state>0</state>
</option>
<option>
<name>TrustZoneModes</name>
<version>0</version>
<state>0</state>
</option>
</data>
</settings>
<settings>
<name>ICCARM</name>
<archiveVersion>2</archiveVersion>
<data>
<version>34</version>
<version>35</version>
<wantNonLocal>1</wantNonLocal>
<debug>1</debug>
<option>
@ -454,6 +463,10 @@
<name>IccRTTI2</name>
<state>0</state>
</option>
<option>
<name>OICompilerExtraOption</name>
<state>1</state>
</option>
</data>
</settings>
<settings>
@ -674,7 +687,7 @@
<name>ILINK</name>
<archiveVersion>0</archiveVersion>
<data>
<version>20</version>
<version>23</version>
<wantNonLocal>1</wantNonLocal>
<debug>1</debug>
<option>
@ -986,6 +999,30 @@
<name>IlinkLocaleSelect</name>
<state>1</state>
</option>
<option>
<name>IlinkTrustzoneImportLibraryOut</name>
<state>###Unitialized###</state>
</option>
<option>
<name>OILinkExtraOption</name>
<state>1</state>
</option>
<option>
<name>IlinkRawBinaryFile2</name>
<state></state>
</option>
<option>
<name>IlinkRawBinarySymbol2</name>
<state></state>
</option>
<option>
<name>IlinkRawBinarySegment2</name>
<state></state>
</option>
<option>
<name>IlinkRawBinaryAlign2</name>
<state></state>
</option>
</data>
</settings>
<settings>
@ -1025,7 +1062,7 @@
<name>General</name>
<archiveVersion>3</archiveVersion>
<data>
<version>29</version>
<version>31</version>
<wantNonLocal>1</wantNonLocal>
<debug>0</debug>
<option>
@ -1130,7 +1167,7 @@
</option>
<option>
<name>GBECoreSlave</name>
<version>25</version>
<version>27</version>
<state>1</state>
</option>
<option>
@ -1147,7 +1184,7 @@
</option>
<option>
<name>CoreVariant</name>
<version>25</version>
<version>27</version>
<state>0</state>
</option>
<option>
@ -1170,7 +1207,7 @@
</option>
<option>
<name>GFPUCoreSlave2</name>
<version>25</version>
<version>27</version>
<state>0</state>
</option>
<option>
@ -1214,13 +1251,22 @@
<name>DSPExtension</name>
<state>0</state>
</option>
<option>
<name>TrustZone</name>
<state>0</state>
</option>
<option>
<name>TrustZoneModes</name>
<version>0</version>
<state>0</state>
</option>
</data>
</settings>
<settings>
<name>ICCARM</name>
<archiveVersion>2</archiveVersion>
<data>
<version>34</version>
<version>35</version>
<wantNonLocal>1</wantNonLocal>
<debug>0</debug>
<option>
@ -1229,6 +1275,7 @@
</option>
<option>
<name>CCDefines</name>
<state></state>
</option>
<option>
<name>CCPreprocFile</name>
@ -1467,6 +1514,10 @@
<name>IccRTTI2</name>
<state>0</state>
</option>
<option>
<name>OICompilerExtraOption</name>
<state>1</state>
</option>
</data>
</settings>
<settings>
@ -1687,7 +1738,7 @@
<name>ILINK</name>
<archiveVersion>0</archiveVersion>
<data>
<version>20</version>
<version>23</version>
<wantNonLocal>1</wantNonLocal>
<debug>0</debug>
<option>
@ -1999,6 +2050,30 @@
<name>IlinkLocaleSelect</name>
<state>1</state>
</option>
<option>
<name>IlinkTrustzoneImportLibraryOut</name>
<state>###Unitialized###</state>
</option>
<option>
<name>OILinkExtraOption</name>
<state>1</state>
</option>
<option>
<name>IlinkRawBinaryFile2</name>
<state></state>
</option>
<option>
<name>IlinkRawBinarySymbol2</name>
<state></state>
</option>
<option>
<name>IlinkRawBinarySegment2</name>
<state></state>
</option>
<option>
<name>IlinkRawBinaryAlign2</name>
<state></state>
</option>
</data>
</settings>
<settings>

2
bsp/stm32/stm32h743-st-nucleo/board/linker_scripts/link.icf
View File

@ -7,7 +7,7 @@ define symbol __ICFEDIT_intvec_start__ = 0x08000000;
define symbol __ICFEDIT_region_ROM_start__ = 0x08000000;
define symbol __ICFEDIT_region_ROM_end__ = 0x081FFFFF;
define symbol __ICFEDIT_region_RAM_start__ = 0x24000000;
define symbol __ICFEDIT_region_RAM_end__ = 0x2007FFFF;
define symbol __ICFEDIT_region_RAM_end__ = 0x2407FFFF;
/*-Sizes-*/
define symbol __ICFEDIT_size_cstack__ = 0x800;
define symbol __ICFEDIT_size_heap__ = 0x400;