Skip to content

Commit ac1ab2d

Browse files
whj4674672whj4674672
committed
[bsp][stm32h7]Fix BUG that cannot run in IAR environment
1 parent c6d1474 commit ac1ab2d

File tree

6 files changed

+289
-67
lines changed

6 files changed

+289
-67
lines changed

‎bsp/stm32/libraries/templates/stm32h7xx/board/linker_scripts/link.icf‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ define symbol __ICFEDIT_intvec_start__ = 0x08000000;
77
define symbol __ICFEDIT_region_ROM_start__ = 0x08000000;
88
define symbol __ICFEDIT_region_ROM_end__ = 0x081FFFFF;
99
define symbol __ICFEDIT_region_RAM_start__ = 0x24000000;
10-
define symbol __ICFEDIT_region_RAM_end__ = 0x2007FFFF;
10+
define symbol __ICFEDIT_region_RAM_end__ = 0x2407FFFF;
1111
/*-Sizes-*/
1212
define symbol __ICFEDIT_size_cstack__ = 0x0400;
1313
define symbol __ICFEDIT_size_heap__ = 0x0000;

‎bsp/stm32/libraries/templates/stm32h7xx/template.ewp‎

Lines changed: 96 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
<name>General</name>
1212
<archiveVersion>3</archiveVersion>
1313
<data>
14-
<version>29</version>
14+
<version>31</version>
1515
<wantNonLocal>1</wantNonLocal>
1616
<debug>1</debug>
1717
<option>
@@ -66,7 +66,7 @@
6666
</option>
6767
<option>
6868
<name>OGLastSavedByProductVersion</name>
69-
<state>8.11.3.13977</state>
69+
<state>8.40.1.21529</state>
7070
</option>
7171
<option>
7272
<name>GeneralEnableMisra</name>
@@ -78,7 +78,7 @@
7878
</option>
7979
<option>
8080
<name>OGChipSelectEditMenu</name>
81-
<state>STM32F407ZG ST STM32F407ZG</state>
81+
<state>STM32H743II ST STM32H743II</state>
8282
</option>
8383
<option>
8484
<name>GenLowLevelInterface</name>
@@ -112,12 +112,12 @@
112112
</option>
113113
<option>
114114
<name>RTConfigPath2</name>
115-
<state>$TOOLKIT_DIR$\INC\c\DLib_Config_Normal.h</state>
115+
<state>$TOOLKIT_DIR$\inc\c\DLib_Config_Normal.h</state>
116116
</option>
117117
<option>
118118
<name>GBECoreSlave</name>
119-
<version>25</version>
120-
<state>39</state>
119+
<version>27</version>
120+
<state>41</state>
121121
</option>
122122
<option>
123123
<name>OGUseCmsis</name>
@@ -133,31 +133,31 @@
133133
</option>
134134
<option>
135135
<name>CoreVariant</name>
136-
<version>25</version>
137-
<state>39</state>
136+
<version>27</version>
137+
<state>41</state>
138138
</option>
139139
<option>
140140
<name>GFPUDeviceSlave</name>
141-
<state>STM32F407ZG ST STM32F407ZG</state>
141+
<state>STM32H743II ST STM32H743II</state>
142142
</option>
143143
<option>
144144
<name>FPU2</name>
145145
<version>0</version>
146-
<state>4</state>
146+
<state>0</state>
147147
</option>
148148
<option>
149149
<name>NrRegs</name>
150150
<version>0</version>
151-
<state>1</state>
151+
<state>0</state>
152152
</option>
153153
<option>
154154
<name>NEON</name>
155155
<state>0</state>
156156
</option>
157157
<option>
158158
<name>GFPUCoreSlave2</name>
159-
<version>25</version>
160-
<state>39</state>
159+
<version>27</version>
160+
<state>41</state>
161161
</option>
162162
<option>
163163
<name>OGCMSISPackSelectDevice</name>
@@ -200,13 +200,22 @@
200200
<name>DSPExtension</name>
201201
<state>1</state>
202202
</option>
203+
<option>
204+
<name>TrustZone</name>
205+
<state>0</state>
206+
</option>
207+
<option>
208+
<name>TrustZoneModes</name>
209+
<version>0</version>
210+
<state>0</state>
211+
</option>
203212
</data>
204213
</settings>
205214
<settings>
206215
<name>ICCARM</name>
207216
<archiveVersion>2</archiveVersion>
208217
<data>
209-
<version>34</version>
218+
<version>35</version>
210219
<wantNonLocal>1</wantNonLocal>
211220
<debug>1</debug>
212221
<option>
@@ -454,6 +463,10 @@
454463
<name>IccRTTI2</name>
455464
<state>0</state>
456465
</option>
466+
<option>
467+
<name>OICompilerExtraOption</name>
468+
<state>1</state>
469+
</option>
457470
</data>
458471
</settings>
459472
<settings>
@@ -674,7 +687,7 @@
674687
<name>ILINK</name>
675688
<archiveVersion>0</archiveVersion>
676689
<data>
677-
<version>20</version>
690+
<version>23</version>
678691
<wantNonLocal>1</wantNonLocal>
679692
<debug>1</debug>
680693
<option>
@@ -986,6 +999,30 @@
986999
<name>IlinkLocaleSelect</name>
9871000
<state>1</state>
9881001
</option>
1002+
<option>
1003+
<name>IlinkTrustzoneImportLibraryOut</name>
1004+
<state>###Unitialized###</state>
1005+
</option>
1006+
<option>
1007+
<name>OILinkExtraOption</name>
1008+
<state>1</state>
1009+
</option>
1010+
<option>
1011+
<name>IlinkRawBinaryFile2</name>
1012+
<state></state>
1013+
</option>
1014+
<option>
1015+
<name>IlinkRawBinarySymbol2</name>
1016+
<state></state>
1017+
</option>
1018+
<option>
1019+
<name>IlinkRawBinarySegment2</name>
1020+
<state></state>
1021+
</option>
1022+
<option>
1023+
<name>IlinkRawBinaryAlign2</name>
1024+
<state></state>
1025+
</option>
9891026
</data>
9901027
</settings>
9911028
<settings>
@@ -1025,7 +1062,7 @@
10251062
<name>General</name>
10261063
<archiveVersion>3</archiveVersion>
10271064
<data>
1028-
<version>29</version>
1065+
<version>31</version>
10291066
<wantNonLocal>1</wantNonLocal>
10301067
<debug>0</debug>
10311068
<option>
@@ -1130,7 +1167,7 @@
11301167
</option>
11311168
<option>
11321169
<name>GBECoreSlave</name>
1133-
<version>25</version>
1170+
<version>27</version>
11341171
<state>1</state>
11351172
</option>
11361173
<option>
@@ -1147,7 +1184,7 @@
11471184
</option>
11481185
<option>
11491186
<name>CoreVariant</name>
1150-
<version>25</version>
1187+
<version>27</version>
11511188
<state>0</state>
11521189
</option>
11531190
<option>
@@ -1170,7 +1207,7 @@
11701207
</option>
11711208
<option>
11721209
<name>GFPUCoreSlave2</name>
1173-
<version>25</version>
1210+
<version>27</version>
11741211
<state>0</state>
11751212
</option>
11761213
<option>
@@ -1214,13 +1251,22 @@
12141251
<name>DSPExtension</name>
12151252
<state>0</state>
12161253
</option>
1254+
<option>
1255+
<name>TrustZone</name>
1256+
<state>0</state>
1257+
</option>
1258+
<option>
1259+
<name>TrustZoneModes</name>
1260+
<version>0</version>
1261+
<state>0</state>
1262+
</option>
12171263
</data>
12181264
</settings>
12191265
<settings>
12201266
<name>ICCARM</name>
12211267
<archiveVersion>2</archiveVersion>
12221268
<data>
1223-
<version>34</version>
1269+
<version>35</version>
12241270
<wantNonLocal>1</wantNonLocal>
12251271
<debug>0</debug>
12261272
<option>
@@ -1229,6 +1275,7 @@
12291275
</option>
12301276
<option>
12311277
<name>CCDefines</name>
1278+
<state></state>
12321279
</option>
12331280
<option>
12341281
<name>CCPreprocFile</name>
@@ -1467,6 +1514,10 @@
14671514
<name>IccRTTI2</name>
14681515
<state>0</state>
14691516
</option>
1517+
<option>
1518+
<name>OICompilerExtraOption</name>
1519+
<state>1</state>
1520+
</option>
14701521
</data>
14711522
</settings>
14721523
<settings>
@@ -1687,7 +1738,7 @@
16871738
<name>ILINK</name>
16881739
<archiveVersion>0</archiveVersion>
16891740
<data>
1690-
<version>20</version>
1741+
<version>23</version>
16911742
<wantNonLocal>1</wantNonLocal>
16921743
<debug>0</debug>
16931744
<option>
@@ -1999,6 +2050,30 @@
19992050
<name>IlinkLocaleSelect</name>
20002051
<state>1</state>
20012052
</option>
2053+
<option>
2054+
<name>IlinkTrustzoneImportLibraryOut</name>
2055+
<state>###Unitialized###</state>
2056+
</option>
2057+
<option>
2058+
<name>OILinkExtraOption</name>
2059+
<state>1</state>
2060+
</option>
2061+
<option>
2062+
<name>IlinkRawBinaryFile2</name>
2063+
<state></state>
2064+
</option>
2065+
<option>
2066+
<name>IlinkRawBinarySymbol2</name>
2067+
<state></state>
2068+
</option>
2069+
<option>
2070+
<name>IlinkRawBinarySegment2</name>
2071+
<state></state>
2072+
</option>
2073+
<option>
2074+
<name>IlinkRawBinaryAlign2</name>
2075+
<state></state>
2076+
</option>
20022077
</data>
20032078
</settings>
20042079
<settings>

‎bsp/stm32/stm32h743-atk-apollo/board/linker_scripts/link.icf‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ define symbol __ICFEDIT_intvec_start__ = 0x08000000;
77
define symbol __ICFEDIT_region_ROM_start__ = 0x08000000;
88
define symbol __ICFEDIT_region_ROM_end__ = 0x081FFFFF;
99
define symbol __ICFEDIT_region_RAM_start__ = 0x24000000;
10-
define symbol __ICFEDIT_region_RAM_end__ = 0x2007FFFF;
10+
define symbol __ICFEDIT_region_RAM_end__ = 0x2407FFFF;
1111
/*-Sizes-*/
1212
define symbol __ICFEDIT_size_cstack__ = 0x0400;
1313
define symbol __ICFEDIT_size_heap__ = 0x0000;

0 commit comments

Comments
 (0)