Skip to content

Commit d213f26

Browse files
TTornblomTTornblom
authored
IAR: Change project type to CMSIS (#61)
The IAR Blinky example was of the wrong project type, so changing the device type in CMSIS Manager was not properly reflected in EWARM. Signed-off-by: Thomas Törnblom <thomas.tornblom@iar.com>
1 parent b4fdc46 commit d213f26

1 file changed

Lines changed: 85 additions & 61 deletions

File tree

  • CMSIS/RTOS2/FreeRTOS/Examples/Blinky_IAR/Blinky

‎CMSIS/RTOS2/FreeRTOS/Examples/Blinky_IAR/Blinky/Blinky.ewp‎

Lines changed: 85 additions & 61 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>33</version>
14+
<version>34</version>
1515
<wantNonLocal>1</wantNonLocal>
1616
<debug>1</debug>
1717
<option>
@@ -48,7 +48,7 @@
4848
</option>
4949
<option>
5050
<name>OGCoreOrChip</name>
51-
<state>0</state>
51+
<state>2</state>
5252
</option>
5353
<option>
5454
<name>GRuntimeLibSelect</name>
@@ -70,7 +70,7 @@
7070
</option>
7171
<option>
7272
<name>OGLastSavedByProductVersion</name>
73-
<state>9.10.2.39304</state>
73+
<state>9.20.4.46976</state>
7474
</option>
7575
<option>
7676
<name>OGChipSelectEditMenu</name>
@@ -98,7 +98,7 @@
9898
</option>
9999
<option>
100100
<name>GBECoreSlave</name>
101-
<version>30</version>
101+
<version>31</version>
102102
<state>38</state>
103103
</option>
104104
<option>
@@ -115,7 +115,7 @@
115115
</option>
116116
<option>
117117
<name>CoreVariant</name>
118-
<version>30</version>
118+
<version>31</version>
119119
<state>38</state>
120120
</option>
121121
<option>
@@ -138,7 +138,7 @@
138138
</option>
139139
<option>
140140
<name>GFPUCoreSlave2</name>
141-
<version>30</version>
141+
<version>31</version>
142142
<state>38</state>
143143
</option>
144144
<option>
@@ -199,6 +199,10 @@
199199
<name>OG_32_64Device</name>
200200
<state>0</state>
201201
</option>
202+
<option>
203+
<name>BuildFilesPath</name>
204+
<state>Debug</state>
205+
</option>
202206
</data>
203207
</settings>
204208
<settings>
@@ -671,7 +675,7 @@
671675
<name>ILINK</name>
672676
<archiveVersion>0</archiveVersion>
673677
<data>
674-
<version>25</version>
678+
<version>26</version>
675679
<wantNonLocal>1</wantNonLocal>
676680
<debug>1</debug>
677681
<option>
@@ -1023,6 +1027,14 @@
10231027
<name>IlinkDemangle</name>
10241028
<state>0</state>
10251029
</option>
1030+
<option>
1031+
<name>IlinkWrapperFileEnable</name>
1032+
<state>0</state>
1033+
</option>
1034+
<option>
1035+
<name>IlinkWrapperFile</name>
1036+
<state></state>
1037+
</option>
10261038
</data>
10271039
</settings>
10281040
<settings>
@@ -1057,7 +1069,7 @@
10571069
<name>General</name>
10581070
<archiveVersion>3</archiveVersion>
10591071
<data>
1060-
<version>33</version>
1072+
<version>34</version>
10611073
<wantNonLocal>1</wantNonLocal>
10621074
<debug>0</debug>
10631075
<option>
@@ -1144,7 +1156,7 @@
11441156
</option>
11451157
<option>
11461158
<name>GBECoreSlave</name>
1147-
<version>30</version>
1159+
<version>31</version>
11481160
<state>38</state>
11491161
</option>
11501162
<option>
@@ -1161,7 +1173,7 @@
11611173
</option>
11621174
<option>
11631175
<name>CoreVariant</name>
1164-
<version>30</version>
1176+
<version>31</version>
11651177
<state>38</state>
11661178
</option>
11671179
<option>
@@ -1184,7 +1196,7 @@
11841196
</option>
11851197
<option>
11861198
<name>GFPUCoreSlave2</name>
1187-
<version>30</version>
1199+
<version>31</version>
11881200
<state>38</state>
11891201
</option>
11901202
<option>
@@ -1245,6 +1257,10 @@
12451257
<name>OG_32_64Device</name>
12461258
<state>0</state>
12471259
</option>
1260+
<option>
1261+
<name>BuildFilesPath</name>
1262+
<state>Release</state>
1263+
</option>
12481264
</data>
12491265
</settings>
12501266
<settings>
@@ -1718,7 +1734,7 @@
17181734
<name>ILINK</name>
17191735
<archiveVersion>0</archiveVersion>
17201736
<data>
1721-
<version>25</version>
1737+
<version>26</version>
17221738
<wantNonLocal>1</wantNonLocal>
17231739
<debug>0</debug>
17241740
<option>
@@ -2070,6 +2086,14 @@
20702086
<name>IlinkDemangle</name>
20712087
<state>0</state>
20722088
</option>
2089+
<option>
2090+
<name>IlinkWrapperFileEnable</name>
2091+
<state>0</state>
2092+
</option>
2093+
<option>
2094+
<name>IlinkWrapperFile</name>
2095+
<state></state>
2096+
</option>
20732097
</data>
20742098
</settings>
20752099
<settings>
@@ -2107,73 +2131,73 @@
21072131
<name>$PROJ_DIR$\RTE\RTE_Components.h</name>
21082132
</file>
21092133
<group>
2110-
<name>CMSIS.RTOS2.FreeRTOS Cortex-M</name>
2134+
<name>ARM FreeRTOS _RTOS.Config.CMSIS RTOS2_10.4.6</name>
21112135
<tag>CMSISPack.Component</tag>
21122136
<file>
2113-
<name>${CMSIS_PACK_PATH_ARM#CMSIS-FreeRTOS#10.4.3}$\CMSIS/RTOS2/FreeRTOS/Source/cmsis_os2.c</name>
2114-
</file>
2115-
<file>
2116-
<name>${CMSIS_PACK_PATH_ARM#CMSIS-FreeRTOS#10.4.3}$\CMSIS/RTOS2/FreeRTOS/Source/os_systick.c</name>
2137+
<name>$PROJ_DIR$\RTE\RTOS\FreeRTOSConfig.h</name>
21172138
</file>
21182139
</group>
21192140
<group>
2120-
<name>Device Startup</name>
2141+
<name>ARM FreeRTOS _RTOS.Core.Cortex-M_10.4.6</name>
21212142
<tag>CMSISPack.Component</tag>
21222143
<file>
2123-
<name>$PROJ_DIR$\RTE\Device\ARMCM3\startup_ARMCM3.s</name>
2144+
<name>${CMSIS_PACK_PATH_ARM#CMSIS-FreeRTOS#10.4.6}$\CMSIS/RTOS2/FreeRTOS/Source/freertos_evr.c</name>
21242145
</file>
21252146
<file>
2126-
<name>$PROJ_DIR$\RTE\Device\ARMCM3\system_ARMCM3.c</name>
2147+
<name>${CMSIS_PACK_PATH_ARM#CMSIS-FreeRTOS#10.4.6}$\Source/list.c</name>
2148+
</file>
2149+
<file>
2150+
<name>${CMSIS_PACK_PATH_ARM#CMSIS-FreeRTOS#10.4.6}$\Source/portable/IAR/ARM_CM3/port.c</name>
2151+
</file>
2152+
<file>
2153+
<name>${CMSIS_PACK_PATH_ARM#CMSIS-FreeRTOS#10.4.6}$\Source/portable/IAR/ARM_CM3/portasm.s</name>
2154+
</file>
2155+
<file>
2156+
<name>${CMSIS_PACK_PATH_ARM#CMSIS-FreeRTOS#10.4.6}$\Source/queue.c</name>
2157+
</file>
2158+
<file>
2159+
<name>${CMSIS_PACK_PATH_ARM#CMSIS-FreeRTOS#10.4.6}$\Source/tasks.c</name>
21272160
</file>
21282161
</group>
21292162
<group>
2130-
<name>ARM FreeRTOS _RTOS.Timers_10.4.3</name>
2163+
<name>ARM FreeRTOS _RTOS.Event Groups_10.4.6</name>
21312164
<tag>CMSISPack.Component</tag>
21322165
<file>
2133-
<name>${CMSIS_PACK_PATH_ARM#CMSIS-FreeRTOS#10.4.3}$\Source/timers.c</name>
2166+
<name>${CMSIS_PACK_PATH_ARM#CMSIS-FreeRTOS#10.4.6}$\Source/event_groups.c</name>
21342167
</file>
21352168
</group>
21362169
<group>
2137-
<name>ARM FreeRTOS _RTOS.Heap.Heap_4_10.4.3</name>
2170+
<name>ARM FreeRTOS _RTOS.Heap.Heap_4_10.4.6</name>
21382171
<tag>CMSISPack.Component</tag>
21392172
<file>
2140-
<name>${CMSIS_PACK_PATH_ARM#CMSIS-FreeRTOS#10.4.3}$\Source/portable/MemMang/heap_4.c</name>
2173+
<name>${CMSIS_PACK_PATH_ARM#CMSIS-FreeRTOS#10.4.6}$\Source/portable/MemMang/heap_4.c</name>
21412174
</file>
21422175
</group>
21432176
<group>
2144-
<name>ARM FreeRTOS _RTOS.Event Groups_10.4.3</name>
2177+
<name>ARM FreeRTOS _RTOS.Timers_10.4.6</name>
21452178
<tag>CMSISPack.Component</tag>
21462179
<file>
2147-
<name>${CMSIS_PACK_PATH_ARM#CMSIS-FreeRTOS#10.4.3}$\Source/event_groups.c</name>
2180+
<name>${CMSIS_PACK_PATH_ARM#CMSIS-FreeRTOS#10.4.6}$\Source/timers.c</name>
21482181
</file>
21492182
</group>
21502183
<group>
2151-
<name>ARM FreeRTOS _RTOS.Core.Cortex-M_10.4.3</name>
2184+
<name>Device Startup</name>
21522185
<tag>CMSISPack.Component</tag>
21532186
<file>
2154-
<name>${CMSIS_PACK_PATH_ARM#CMSIS-FreeRTOS#10.4.3}$\CMSIS/RTOS2/FreeRTOS/Source/freertos_evr.c</name>
2155-
</file>
2156-
<file>
2157-
<name>${CMSIS_PACK_PATH_ARM#CMSIS-FreeRTOS#10.4.3}$\Source/list.c</name>
2158-
</file>
2159-
<file>
2160-
<name>${CMSIS_PACK_PATH_ARM#CMSIS-FreeRTOS#10.4.3}$\Source/portable/IAR/ARM_CM3/port.c</name>
2161-
</file>
2162-
<file>
2163-
<name>${CMSIS_PACK_PATH_ARM#CMSIS-FreeRTOS#10.4.3}$\Source/portable/IAR/ARM_CM3/portasm.s</name>
2164-
</file>
2165-
<file>
2166-
<name>${CMSIS_PACK_PATH_ARM#CMSIS-FreeRTOS#10.4.3}$\Source/queue.c</name>
2187+
<name>$PROJ_DIR$\RTE\Device\ARMCM3\startup_ARMCM3.s</name>
21672188
</file>
21682189
<file>
2169-
<name>${CMSIS_PACK_PATH_ARM#CMSIS-FreeRTOS#10.4.3}$\Source/tasks.c</name>
2190+
<name>$PROJ_DIR$\RTE\Device\ARMCM3\system_ARMCM3.c</name>
21702191
</file>
21712192
</group>
21722193
<group>
2173-
<name>ARM FreeRTOS _RTOS.Config.CMSIS RTOS2_10.4.3</name>
2194+
<name>CMSIS.RTOS2.FreeRTOS Cortex-M</name>
21742195
<tag>CMSISPack.Component</tag>
21752196
<file>
2176-
<name>$PROJ_DIR$\RTE\RTOS\FreeRTOSConfig.h</name>
2197+
<name>${CMSIS_PACK_PATH_ARM#CMSIS-FreeRTOS#10.4.6}$\CMSIS/RTOS2/FreeRTOS/Source/cmsis_os2.c</name>
2198+
</file>
2199+
<file>
2200+
<name>${CMSIS_PACK_PATH_ARM#CMSIS-FreeRTOS#10.4.6}$\CMSIS/RTOS2/FreeRTOS/Source/os_systick.c</name>
21772201
</file>
21782202
</group>
21792203
</group>
@@ -2182,34 +2206,34 @@
21822206
&lt;configuration xmlns:xs="http://www.w3.org/2001/XMLSchema-instance"&gt;
21832207
&lt;toolchain Tcompiler="IAR" Toutput="exe"/&gt;
21842208
&lt;components&gt;
2185-
&lt;component Cclass="CMSIS" Cgroup="CORE" Cvendor="ARM" Cversion="5.4.0"&gt;
2186-
&lt;package name="CMSIS" url="http://www.keil.com/pack/" vendor="ARM" version="5.7.0"/&gt;
2209+
&lt;component Cclass="CMSIS" Cgroup="CORE" Cvendor="ARM" Cversion="5.6.0"&gt;
2210+
&lt;package name="CMSIS" url="http://www.keil.com/pack/" vendor="ARM" version="5.9.0"/&gt;
21872211
&lt;file category="doc" name="CMSIS/Documentation/Core/html/index.html"/&gt;
21882212
&lt;file category="include" name="CMSIS/Core/Include/"/&gt;
21892213
&lt;file category="header" condition="TrustZone" name="CMSIS/Core/Include/tz_context.h"/&gt;
21902214
&lt;file attr="template" category="sourceC" condition="TZ Secure" name="CMSIS/Core/Template/ARMv8-M/main_s.c" select="Secure mode 'main' module for ARMv8-M" version="1.1.1"/&gt;
21912215
&lt;file attr="template" category="sourceC" condition="TZ Secure" name="CMSIS/Core/Template/ARMv8-M/tz_context.c" select="RTOS Context Management (TrustZone for ARMv8-M)" version="1.1.1"/&gt;
21922216
&lt;/component&gt;
2193-
&lt;component Capiversion="2.1.3" Cclass="CMSIS" Cgroup="RTOS2" Csub="FreeRTOS" Cvariant="Cortex-M" Cvendor="ARM" Cversion="10.4.3"&gt;
2194-
&lt;package name="CMSIS-FreeRTOS" url="http://www.keil.com/pack/" vendor="ARM" version="10.4.3"/&gt;
2217+
&lt;component Capiversion="2.1.3" Cclass="CMSIS" Cgroup="RTOS2" Csub="FreeRTOS" Cvariant="Cortex-M" Cvendor="ARM" Cversion="10.4.6"&gt;
2218+
&lt;package name="CMSIS-FreeRTOS" url="http://www.keil.com/pack/" vendor="ARM" version="10.4.6"/&gt;
21952219
&lt;file category="doc" name="CMSIS/Documentation/General/html/index.html"/&gt;
21962220
&lt;file category="header" name="CMSIS/RTOS2/FreeRTOS/Include/freertos_mpool.h"/&gt;
21972221
&lt;file category="source" name="CMSIS/RTOS2/FreeRTOS/Source/cmsis_os2.c"/&gt;
21982222
&lt;file category="source" name="CMSIS/RTOS2/FreeRTOS/Source/os_systick.c"/&gt;
21992223
&lt;/component&gt;
22002224
&lt;component Cclass="Device" Cgroup="Startup" Cvendor="ARM" Cversion="1.2.2" deviceDependent="1"&gt;
2201-
&lt;package name="CMSIS" url="http://www.keil.com/pack/" vendor="ARM" version="5.7.0"/&gt;
2225+
&lt;package name="CMSIS" url="http://www.keil.com/pack/" vendor="ARM" version="5.9.0"/&gt;
22022226
&lt;file category="header" deviceDependent="1" name="Device/ARM/ARMCM3/Include/ARMCM3.h"/&gt;
22032227
&lt;file attr="config" category="sourceAsm" condition="IAR" deviceDependent="1" name="Device/ARM/ARMCM3/Source/IAR/startup_ARMCM3.s" version="1.0.0"/&gt;
22042228
&lt;file attr="config" category="sourceC" deviceDependent="1" name="Device/ARM/ARMCM3/Source/system_ARMCM3.c" version="1.0.1"/&gt;
22052229
&lt;/component&gt;
2206-
&lt;component Cbundle="FreeRTOS" Cbundleversion="10.4.3" Cclass="RTOS" Cgroup="Config" Cvariant="CMSIS RTOS2" Cvendor="ARM" Cversion="10.4.3"&gt;
2207-
&lt;package name="CMSIS-FreeRTOS" url="http://www.keil.com/pack/" vendor="ARM" version="10.4.3"/&gt;
2230+
&lt;component Cbundle="FreeRTOS" Cbundleversion="10.4.6" Cclass="RTOS" Cgroup="Config" Cvariant="CMSIS RTOS2" Cvendor="ARM" Cversion="10.4.6"&gt;
2231+
&lt;package name="CMSIS-FreeRTOS" url="http://www.keil.com/pack/" vendor="ARM" version="10.4.6"/&gt;
22082232
&lt;file category="doc" name="CMSIS/Documentation/General/html/cre_freertos_proj.html#cmsis_freertos_config"/&gt;
22092233
&lt;file attr="config" category="header" condition="CoreM" name="CMSIS/RTOS2/FreeRTOS/Config/ARMCM/FreeRTOSConfig.h" version="10.3.0"/&gt;
22102234
&lt;/component&gt;
2211-
&lt;component Cbundle="FreeRTOS" Cbundleversion="10.4.3" Cclass="RTOS" Cgroup="Core" Cvariant="Cortex-M" Cvendor="ARM" Cversion="10.4.3"&gt;
2212-
&lt;package name="CMSIS-FreeRTOS" url="http://www.keil.com/pack/" vendor="ARM" version="10.4.3"/&gt;
2235+
&lt;component Cbundle="FreeRTOS" Cbundleversion="10.4.6" Cclass="RTOS" Cgroup="Core" Cvariant="Cortex-M" Cvendor="ARM" Cversion="10.4.6"&gt;
2236+
&lt;package name="CMSIS-FreeRTOS" url="http://www.keil.com/pack/" vendor="ARM" version="10.4.6"/&gt;
22132237
&lt;file category="include" name="Source/include/"/&gt;
22142238
&lt;file category="header" name="Source/include/FreeRTOS.h"/&gt;
22152239
&lt;file category="header" name="Source/include/queue.h"/&gt;
@@ -2225,31 +2249,31 @@
22252249
&lt;file category="source" name="CMSIS/RTOS2/FreeRTOS/Source/freertos_evr.c"/&gt;
22262250
&lt;file category="other" name="CMSIS/RTOS2/FreeRTOS/FreeRTOS.scvd"/&gt;
22272251
&lt;/component&gt;
2228-
&lt;component Cbundle="FreeRTOS" Cbundleversion="10.4.3" Cclass="RTOS" Cgroup="Event Groups" Cvendor="ARM" Cversion="10.4.3"&gt;
2229-
&lt;package name="CMSIS-FreeRTOS" url="http://www.keil.com/pack/" vendor="ARM" version="10.4.3"/&gt;
2252+
&lt;component Cbundle="FreeRTOS" Cbundleversion="10.4.6" Cclass="RTOS" Cgroup="Event Groups" Cvendor="ARM" Cversion="10.4.6"&gt;
2253+
&lt;package name="CMSIS-FreeRTOS" url="http://www.keil.com/pack/" vendor="ARM" version="10.4.6"/&gt;
22302254
&lt;file category="header" name="Source/include/event_groups.h"/&gt;
22312255
&lt;file category="source" name="Source/event_groups.c"/&gt;
22322256
&lt;/component&gt;
2233-
&lt;component Cbundle="FreeRTOS" Cbundleversion="10.4.3" Cclass="RTOS" Cgroup="Heap" Cvariant="Heap_4" Cvendor="ARM" Cversion="10.4.3"&gt;
2234-
&lt;package name="CMSIS-FreeRTOS" url="http://www.keil.com/pack/" vendor="ARM" version="10.4.3"/&gt;
2257+
&lt;component Cbundle="FreeRTOS" Cbundleversion="10.4.6" Cclass="RTOS" Cgroup="Heap" Cvariant="Heap_4" Cvendor="ARM" Cversion="10.4.6"&gt;
2258+
&lt;package name="CMSIS-FreeRTOS" url="http://www.keil.com/pack/" vendor="ARM" version="10.4.6"/&gt;
22352259
&lt;file category="source" name="Source/portable/MemMang/heap_4.c"/&gt;
22362260
&lt;file category="doc" name="http://www.freertos.org/a00111.html"/&gt;
22372261
&lt;/component&gt;
2238-
&lt;component Cbundle="FreeRTOS" Cbundleversion="10.4.3" Cclass="RTOS" Cgroup="Timers" Cvendor="ARM" Cversion="10.4.3"&gt;
2239-
&lt;package name="CMSIS-FreeRTOS" url="http://www.keil.com/pack/" vendor="ARM" version="10.4.3"/&gt;
2262+
&lt;component Cbundle="FreeRTOS" Cbundleversion="10.4.6" Cclass="RTOS" Cgroup="Timers" Cvendor="ARM" Cversion="10.4.6"&gt;
2263+
&lt;package name="CMSIS-FreeRTOS" url="http://www.keil.com/pack/" vendor="ARM" version="10.4.6"/&gt;
22402264
&lt;file category="header" name="Source/include/timers.h"/&gt;
22412265
&lt;file category="source" name="Source/timers.c"/&gt;
22422266
&lt;/component&gt;
22432267
&lt;/components&gt;
22442268
&lt;apis&gt;
22452269
&lt;api Capiversion="2.1.3" Cclass="CMSIS" Cgroup="RTOS2" Cvendor="ARM" Cversion="2.1.3" exclusive="1"&gt;
2246-
&lt;package name="CMSIS" url="http://www.keil.com/pack/" vendor="ARM" version="5.7.0"/&gt;
2270+
&lt;package name="CMSIS" url="http://www.keil.com/pack/" vendor="ARM" version="5.9.0"/&gt;
22472271
&lt;file category="doc" name="CMSIS/Documentation/RTOS2/html/index.html"/&gt;
22482272
&lt;file category="header" name="CMSIS/RTOS2/Include/cmsis_os2.h"/&gt;
22492273
&lt;/api&gt;
22502274
&lt;/apis&gt;
2251-
&lt;device Dclock="10000000" Dcore="Cortex-M3" DcoreVersion="r2p1" Dendian="Little-endian" Dfamily="ARM Cortex M3" Dfpu="NO_FPU" Dmpu="MPU" Dname="ARMCM3" Dvendor="ARM:82" info="ARM , 128 KB RAM, 256 KB ROM" url="http://www.keil.com/dd2/arm/armcm3"&gt;
2252-
&lt;package info="CMSIS (Cortex Microcontroller Software Interface Standard)" name="CMSIS" url="http://www.keil.com/pack/" vendor="ARM" version="5.7.0"/&gt;
2275+
&lt;device Dclock="10000000" Dcore="Cortex-M3" DcoreVersion="r2p1" Dendian="Little-endian" Dfamily="ARM Cortex M3" Dfpu="NO_FPU" Dmpu="MPU" Dname="ARMCM3" Dvendor="ARM:82" info="ARM , 128 KB RAM, 256 KB ROM" url="https://www.keil.com/dd2/arm/armcm3"&gt;
2276+
&lt;package info="CMSIS (Common Microcontroller Software Interface Standard)" name="CMSIS" url="http://www.keil.com/pack/" vendor="ARM" version="5.9.0"/&gt;
22532277
&lt;/device&gt;
22542278
&lt;packages useAllLatestPacks="1"/&gt;
22552279
&lt;/configuration&gt;

0 commit comments

Comments
 (0)