From d213f261b5be6bb29a7cce8b84071706b72f4d53 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thomas=20T=C3=B6rnblom?= Date: Wed, 30 Nov 2022 15:34:08 +0100 Subject: [PATCH] IAR: Change project type to CMSIS (#61) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 --- .../Examples/Blinky_IAR/Blinky/Blinky.ewp | 146 ++++++++++-------- 1 file changed, 85 insertions(+), 61 deletions(-) diff --git a/CMSIS/RTOS2/FreeRTOS/Examples/Blinky_IAR/Blinky/Blinky.ewp b/CMSIS/RTOS2/FreeRTOS/Examples/Blinky_IAR/Blinky/Blinky.ewp index 47ab304e9..1c6c443af 100644 --- a/CMSIS/RTOS2/FreeRTOS/Examples/Blinky_IAR/Blinky/Blinky.ewp +++ b/CMSIS/RTOS2/FreeRTOS/Examples/Blinky_IAR/Blinky/Blinky.ewp @@ -11,7 +11,7 @@ General 3 - 33 + 34 1 1 + @@ -671,7 +675,7 @@ ILINK 0 - 25 + 26 1 1 + + @@ -1057,7 +1069,7 @@ General 3 - 33 + 34 1 0 + @@ -1718,7 +1734,7 @@ ILINK 0 - 25 + 26 1 0 + + @@ -2107,73 +2131,73 @@ $PROJ_DIR$\RTE\RTE_Components.h - CMSIS.RTOS2.FreeRTOS Cortex-M + ARM FreeRTOS _RTOS.Config.CMSIS RTOS2_10.4.6 CMSISPack.Component - ${CMSIS_PACK_PATH_ARM#CMSIS-FreeRTOS#10.4.3}$\CMSIS/RTOS2/FreeRTOS/Source/cmsis_os2.c - - - ${CMSIS_PACK_PATH_ARM#CMSIS-FreeRTOS#10.4.3}$\CMSIS/RTOS2/FreeRTOS/Source/os_systick.c + $PROJ_DIR$\RTE\RTOS\FreeRTOSConfig.h - Device Startup + ARM FreeRTOS _RTOS.Core.Cortex-M_10.4.6 CMSISPack.Component - $PROJ_DIR$\RTE\Device\ARMCM3\startup_ARMCM3.s + ${CMSIS_PACK_PATH_ARM#CMSIS-FreeRTOS#10.4.6}$\CMSIS/RTOS2/FreeRTOS/Source/freertos_evr.c - $PROJ_DIR$\RTE\Device\ARMCM3\system_ARMCM3.c + ${CMSIS_PACK_PATH_ARM#CMSIS-FreeRTOS#10.4.6}$\Source/list.c + + + ${CMSIS_PACK_PATH_ARM#CMSIS-FreeRTOS#10.4.6}$\Source/portable/IAR/ARM_CM3/port.c + + + ${CMSIS_PACK_PATH_ARM#CMSIS-FreeRTOS#10.4.6}$\Source/portable/IAR/ARM_CM3/portasm.s + + + ${CMSIS_PACK_PATH_ARM#CMSIS-FreeRTOS#10.4.6}$\Source/queue.c + + + ${CMSIS_PACK_PATH_ARM#CMSIS-FreeRTOS#10.4.6}$\Source/tasks.c - ARM FreeRTOS _RTOS.Timers_10.4.3 + ARM FreeRTOS _RTOS.Event Groups_10.4.6 CMSISPack.Component - ${CMSIS_PACK_PATH_ARM#CMSIS-FreeRTOS#10.4.3}$\Source/timers.c + ${CMSIS_PACK_PATH_ARM#CMSIS-FreeRTOS#10.4.6}$\Source/event_groups.c - ARM FreeRTOS _RTOS.Heap.Heap_4_10.4.3 + ARM FreeRTOS _RTOS.Heap.Heap_4_10.4.6 CMSISPack.Component - ${CMSIS_PACK_PATH_ARM#CMSIS-FreeRTOS#10.4.3}$\Source/portable/MemMang/heap_4.c + ${CMSIS_PACK_PATH_ARM#CMSIS-FreeRTOS#10.4.6}$\Source/portable/MemMang/heap_4.c - ARM FreeRTOS _RTOS.Event Groups_10.4.3 + ARM FreeRTOS _RTOS.Timers_10.4.6 CMSISPack.Component - ${CMSIS_PACK_PATH_ARM#CMSIS-FreeRTOS#10.4.3}$\Source/event_groups.c + ${CMSIS_PACK_PATH_ARM#CMSIS-FreeRTOS#10.4.6}$\Source/timers.c - ARM FreeRTOS _RTOS.Core.Cortex-M_10.4.3 + Device Startup CMSISPack.Component - ${CMSIS_PACK_PATH_ARM#CMSIS-FreeRTOS#10.4.3}$\CMSIS/RTOS2/FreeRTOS/Source/freertos_evr.c - - - ${CMSIS_PACK_PATH_ARM#CMSIS-FreeRTOS#10.4.3}$\Source/list.c - - - ${CMSIS_PACK_PATH_ARM#CMSIS-FreeRTOS#10.4.3}$\Source/portable/IAR/ARM_CM3/port.c - - - ${CMSIS_PACK_PATH_ARM#CMSIS-FreeRTOS#10.4.3}$\Source/portable/IAR/ARM_CM3/portasm.s - - - ${CMSIS_PACK_PATH_ARM#CMSIS-FreeRTOS#10.4.3}$\Source/queue.c + $PROJ_DIR$\RTE\Device\ARMCM3\startup_ARMCM3.s - ${CMSIS_PACK_PATH_ARM#CMSIS-FreeRTOS#10.4.3}$\Source/tasks.c + $PROJ_DIR$\RTE\Device\ARMCM3\system_ARMCM3.c - ARM FreeRTOS _RTOS.Config.CMSIS RTOS2_10.4.3 + CMSIS.RTOS2.FreeRTOS Cortex-M CMSISPack.Component - $PROJ_DIR$\RTE\RTOS\FreeRTOSConfig.h + ${CMSIS_PACK_PATH_ARM#CMSIS-FreeRTOS#10.4.6}$\CMSIS/RTOS2/FreeRTOS/Source/cmsis_os2.c + + + ${CMSIS_PACK_PATH_ARM#CMSIS-FreeRTOS#10.4.6}$\CMSIS/RTOS2/FreeRTOS/Source/os_systick.c @@ -2182,34 +2206,34 @@ <configuration xmlns:xs="http://www.w3.org/2001/XMLSchema-instance"> <toolchain Tcompiler="IAR" Toutput="exe"/> <components> - <component Cclass="CMSIS" Cgroup="CORE" Cvendor="ARM" Cversion="5.4.0"> - <package name="CMSIS" url="http://www.keil.com/pack/" vendor="ARM" version="5.7.0"/> + <component Cclass="CMSIS" Cgroup="CORE" Cvendor="ARM" Cversion="5.6.0"> + <package name="CMSIS" url="http://www.keil.com/pack/" vendor="ARM" version="5.9.0"/> <file category="doc" name="CMSIS/Documentation/Core/html/index.html"/> <file category="include" name="CMSIS/Core/Include/"/> <file category="header" condition="TrustZone" name="CMSIS/Core/Include/tz_context.h"/> <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"/> <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"/> </component> - <component Capiversion="2.1.3" Cclass="CMSIS" Cgroup="RTOS2" Csub="FreeRTOS" Cvariant="Cortex-M" Cvendor="ARM" Cversion="10.4.3"> - <package name="CMSIS-FreeRTOS" url="http://www.keil.com/pack/" vendor="ARM" version="10.4.3"/> + <component Capiversion="2.1.3" Cclass="CMSIS" Cgroup="RTOS2" Csub="FreeRTOS" Cvariant="Cortex-M" Cvendor="ARM" Cversion="10.4.6"> + <package name="CMSIS-FreeRTOS" url="http://www.keil.com/pack/" vendor="ARM" version="10.4.6"/> <file category="doc" name="CMSIS/Documentation/General/html/index.html"/> <file category="header" name="CMSIS/RTOS2/FreeRTOS/Include/freertos_mpool.h"/> <file category="source" name="CMSIS/RTOS2/FreeRTOS/Source/cmsis_os2.c"/> <file category="source" name="CMSIS/RTOS2/FreeRTOS/Source/os_systick.c"/> </component> <component Cclass="Device" Cgroup="Startup" Cvendor="ARM" Cversion="1.2.2" deviceDependent="1"> - <package name="CMSIS" url="http://www.keil.com/pack/" vendor="ARM" version="5.7.0"/> + <package name="CMSIS" url="http://www.keil.com/pack/" vendor="ARM" version="5.9.0"/> <file category="header" deviceDependent="1" name="Device/ARM/ARMCM3/Include/ARMCM3.h"/> <file attr="config" category="sourceAsm" condition="IAR" deviceDependent="1" name="Device/ARM/ARMCM3/Source/IAR/startup_ARMCM3.s" version="1.0.0"/> <file attr="config" category="sourceC" deviceDependent="1" name="Device/ARM/ARMCM3/Source/system_ARMCM3.c" version="1.0.1"/> </component> - <component Cbundle="FreeRTOS" Cbundleversion="10.4.3" Cclass="RTOS" Cgroup="Config" Cvariant="CMSIS RTOS2" Cvendor="ARM" Cversion="10.4.3"> - <package name="CMSIS-FreeRTOS" url="http://www.keil.com/pack/" vendor="ARM" version="10.4.3"/> + <component Cbundle="FreeRTOS" Cbundleversion="10.4.6" Cclass="RTOS" Cgroup="Config" Cvariant="CMSIS RTOS2" Cvendor="ARM" Cversion="10.4.6"> + <package name="CMSIS-FreeRTOS" url="http://www.keil.com/pack/" vendor="ARM" version="10.4.6"/> <file category="doc" name="CMSIS/Documentation/General/html/cre_freertos_proj.html#cmsis_freertos_config"/> <file attr="config" category="header" condition="CoreM" name="CMSIS/RTOS2/FreeRTOS/Config/ARMCM/FreeRTOSConfig.h" version="10.3.0"/> </component> - <component Cbundle="FreeRTOS" Cbundleversion="10.4.3" Cclass="RTOS" Cgroup="Core" Cvariant="Cortex-M" Cvendor="ARM" Cversion="10.4.3"> - <package name="CMSIS-FreeRTOS" url="http://www.keil.com/pack/" vendor="ARM" version="10.4.3"/> + <component Cbundle="FreeRTOS" Cbundleversion="10.4.6" Cclass="RTOS" Cgroup="Core" Cvariant="Cortex-M" Cvendor="ARM" Cversion="10.4.6"> + <package name="CMSIS-FreeRTOS" url="http://www.keil.com/pack/" vendor="ARM" version="10.4.6"/> <file category="include" name="Source/include/"/> <file category="header" name="Source/include/FreeRTOS.h"/> <file category="header" name="Source/include/queue.h"/> @@ -2225,31 +2249,31 @@ <file category="source" name="CMSIS/RTOS2/FreeRTOS/Source/freertos_evr.c"/> <file category="other" name="CMSIS/RTOS2/FreeRTOS/FreeRTOS.scvd"/> </component> - <component Cbundle="FreeRTOS" Cbundleversion="10.4.3" Cclass="RTOS" Cgroup="Event Groups" Cvendor="ARM" Cversion="10.4.3"> - <package name="CMSIS-FreeRTOS" url="http://www.keil.com/pack/" vendor="ARM" version="10.4.3"/> + <component Cbundle="FreeRTOS" Cbundleversion="10.4.6" Cclass="RTOS" Cgroup="Event Groups" Cvendor="ARM" Cversion="10.4.6"> + <package name="CMSIS-FreeRTOS" url="http://www.keil.com/pack/" vendor="ARM" version="10.4.6"/> <file category="header" name="Source/include/event_groups.h"/> <file category="source" name="Source/event_groups.c"/> </component> - <component Cbundle="FreeRTOS" Cbundleversion="10.4.3" Cclass="RTOS" Cgroup="Heap" Cvariant="Heap_4" Cvendor="ARM" Cversion="10.4.3"> - <package name="CMSIS-FreeRTOS" url="http://www.keil.com/pack/" vendor="ARM" version="10.4.3"/> + <component Cbundle="FreeRTOS" Cbundleversion="10.4.6" Cclass="RTOS" Cgroup="Heap" Cvariant="Heap_4" Cvendor="ARM" Cversion="10.4.6"> + <package name="CMSIS-FreeRTOS" url="http://www.keil.com/pack/" vendor="ARM" version="10.4.6"/> <file category="source" name="Source/portable/MemMang/heap_4.c"/> <file category="doc" name="http://www.freertos.org/a00111.html"/> </component> - <component Cbundle="FreeRTOS" Cbundleversion="10.4.3" Cclass="RTOS" Cgroup="Timers" Cvendor="ARM" Cversion="10.4.3"> - <package name="CMSIS-FreeRTOS" url="http://www.keil.com/pack/" vendor="ARM" version="10.4.3"/> + <component Cbundle="FreeRTOS" Cbundleversion="10.4.6" Cclass="RTOS" Cgroup="Timers" Cvendor="ARM" Cversion="10.4.6"> + <package name="CMSIS-FreeRTOS" url="http://www.keil.com/pack/" vendor="ARM" version="10.4.6"/> <file category="header" name="Source/include/timers.h"/> <file category="source" name="Source/timers.c"/> </component> </components> <apis> <api Capiversion="2.1.3" Cclass="CMSIS" Cgroup="RTOS2" Cvendor="ARM" Cversion="2.1.3" exclusive="1"> - <package name="CMSIS" url="http://www.keil.com/pack/" vendor="ARM" version="5.7.0"/> + <package name="CMSIS" url="http://www.keil.com/pack/" vendor="ARM" version="5.9.0"/> <file category="doc" name="CMSIS/Documentation/RTOS2/html/index.html"/> <file category="header" name="CMSIS/RTOS2/Include/cmsis_os2.h"/> </api> </apis> - <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"> - <package info="CMSIS (Cortex Microcontroller Software Interface Standard)" name="CMSIS" url="http://www.keil.com/pack/" vendor="ARM" version="5.7.0"/> + <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"> + <package info="CMSIS (Common Microcontroller Software Interface Standard)" name="CMSIS" url="http://www.keil.com/pack/" vendor="ARM" version="5.9.0"/> </device> <packages useAllLatestPacks="1"/> </configuration>