Pack: Removed Fixed Virtual Platform board.
Fixed RTX MemPool example.
Change-Id: Iece3c434d28a16c5a89449cd3f0a569df20640ae
diff --git a/ARM.CMSIS.pdsc b/ARM.CMSIS.pdsc
index 858d9af..c48932e 100644
--- a/ARM.CMSIS.pdsc
+++ b/ARM.CMSIS.pdsc
@@ -3684,13 +3684,6 @@
<compatibleDevice deviceIndex="0" Dvendor="ARM:82" Dname="ARMCM35P_DSP_FP"/>
<compatibleDevice deviceIndex="0" Dvendor="ARM:82" Dname="ARMCM35P_DSP_FP_TZ"/>
</board>
-
- <board name="Fixed Virtual Platform" vendor="ARM">
- <description>Fixed Virtual Platform</description>
- <mountedDevice deviceIndex="0" Dvendor="ARM:82" Dname="ARMCA5"/>
- <compatibleDevice deviceIndex="0" Dvendor="ARM:82" Dname="ARMCA7"/>
- <compatibleDevice deviceIndex="0" Dvendor="ARM:82" Dname="ARMCA9"/>
- </board>
</boards>
<examples>
@@ -3953,7 +3946,7 @@
<example name="CMSIS-RTOS2 RTX5 Memory Pool" doc="Abstract.txt" folder="CMSIS/RTOS2/RTX/Examples/MemPool">
<description>CMSIS-RTOS2 Memory Pool Example</description>
- <board name="Fixed Virtual Platform" vendor="ARM"/>
+ <board name="uVision Simulator" vendor="Keil"/>
<project>
<environment name="uv" load="MemPool.uvprojx"/>
</project>
diff --git a/CMSIS/RTOS2/RTX/Examples/MemPool/Abstract.txt b/CMSIS/RTOS2/RTX/Examples/MemPool/Abstract.txt
index 1b4de12..fcac5a7 100644
--- a/CMSIS/RTOS2/RTX/Examples/MemPool/Abstract.txt
+++ b/CMSIS/RTOS2/RTX/Examples/MemPool/Abstract.txt
@@ -11,4 +11,4 @@
The MemPool example program is available for one target:
- Fixed Virtual Platform: configured for a simulated on-chip Flash
+ Simulation: configured for a simulated on-chip Flash
diff --git a/CMSIS/RTOS2/RTX/Examples/MemPool/MemPool.uvoptx b/CMSIS/RTOS2/RTX/Examples/MemPool/MemPool.uvoptx
index 9da53e9..b79d26a 100644
--- a/CMSIS/RTOS2/RTX/Examples/MemPool/MemPool.uvoptx
+++ b/CMSIS/RTOS2/RTX/Examples/MemPool/MemPool.uvoptx
@@ -79,8 +79,8 @@
</OPTFL>
<CpuCode>7</CpuCode>
<DebugOpt>
- <uSim>0</uSim>
- <uTrg>1</uTrg>
+ <uSim>1</uSim>
+ <uTrg>0</uTrg>
<sLdApp>1</sLdApp>
<sGomain>1</sGomain>
<sRbreak>1</sRbreak>
diff --git a/CMSIS/RTOS2/RTX/Examples/MemPool/MemPool.uvprojx b/CMSIS/RTOS2/RTX/Examples/MemPool/MemPool.uvprojx
index 748a57e..0dab460 100644
--- a/CMSIS/RTOS2/RTX/Examples/MemPool/MemPool.uvprojx
+++ b/CMSIS/RTOS2/RTX/Examples/MemPool/MemPool.uvprojx
@@ -7,7 +7,7 @@
<Targets>
<Target>
- <TargetName>Fixed Virtual Platform</TargetName>
+ <TargetName>Simulator</TargetName>
<ToolsetNumber>0x4</ToolsetNumber>
<ToolsetName>ARM-ADS</ToolsetName>
<pCCUsed>5060750::V5.06 update 6 (build 750)::ARMCC</pCCUsed>
@@ -16,7 +16,7 @@
<TargetCommonOption>
<Device>ARMCM3</Device>
<Vendor>ARM</Vendor>
- <PackID>ARM.CMSIS.5.3.1-dev7</PackID>
+ <PackID>ARM.CMSIS.5.5.0-dev2</PackID>
<PackURL>http://www.keil.com/pack/</PackURL>
<Cpu>IRAM(0x20000000,0x00020000) IROM(0x00000000,0x00040000) CPUTYPE("Cortex-M3") CLOCK(12000000) ESEL ELITTLE</Cpu>
<FlashUtilSpec></FlashUtilSpec>
@@ -133,7 +133,7 @@
<UseExternalTool>0</UseExternalTool>
<RunIndependent>0</RunIndependent>
<UpdateFlashBeforeDebugging>1</UpdateFlashBeforeDebugging>
- <Capability>1</Capability>
+ <Capability>0</Capability>
<DriverSelection>4096</DriverSelection>
</Flash1>
<bUseTDR>1</bUseTDR>
@@ -412,7 +412,7 @@
<api Capiversion="2.1.1" Cclass="CMSIS" Cgroup="RTOS2" exclusive="1">
<package name="CMSIS" schemaVersion="1.3" url="http://www.keil.com/pack/" vendor="ARM" version="5.1.1-dev1"/>
<targetInfos>
- <targetInfo name="Fixed Virtual Platform"/>
+ <targetInfo name="Simulator"/>
</targetInfos>
</api>
</apis>
@@ -420,73 +420,73 @@
<component Cclass="CMSIS" Cgroup="CORE" Cvendor="ARM" Cversion="5.0.2" condition="ARMv6_7_8-M Device">
<package name="CMSIS" schemaVersion="1.3" url="http://www.keil.com/pack/" vendor="ARM" version="5.1.1-dev1"/>
<targetInfos>
- <targetInfo name="Fixed Virtual Platform"/>
+ <targetInfo name="Simulator"/>
</targetInfos>
</component>
<component Capiversion="2.1.3" Cclass="CMSIS" Cgroup="RTOS2" Csub="Keil RTX5" Cvariant="Source" Cvendor="ARM" Cversion="5.4.0" condition="RTOS2 RTX5">
<package name="CMSIS" schemaVersion="1.3" url="http://www.keil.com/pack/" vendor="ARM" version="5.3.1-dev4"/>
<targetInfos>
- <targetInfo name="Fixed Virtual Platform"/>
+ <targetInfo name="Simulator"/>
</targetInfos>
</component>
<component Cclass="Device" Cgroup="Startup" Cvendor="ARM" Cversion="1.0.1" condition="ARMCM3 CMSIS">
<package name="CMSIS" schemaVersion="1.3" url="http://www.keil.com/pack/" vendor="ARM" version="5.1.1-dev1"/>
<targetInfos>
- <targetInfo name="Fixed Virtual Platform"/>
+ <targetInfo name="Simulator"/>
</targetInfos>
</component>
<component Cbundle="ARM Compiler" Cclass="Compiler" Cgroup="Event Recorder" Cvariant="DAP" Cvendor="Keil" Cversion="1.1.0" condition="Cortex-M Device">
<package name="ARM_Compiler" schemaVersion="1.4.9" url="http://www.keil.com/pack/" vendor="Keil" version="1.3.1"/>
<targetInfos>
- <targetInfo name="Fixed Virtual Platform"/>
+ <targetInfo name="Simulator"/>
</targetInfos>
</component>
<component Cbundle="ARM Compiler" Cclass="Compiler" Cgroup="I/O" Csub="STDOUT" Cvariant="EVR" Cvendor="Keil" Cversion="1.2.0" condition="ARMCC Cortex-M with EVR">
<package name="ARM_Compiler" schemaVersion="1.4.9" url="http://www.keil.com/pack/" vendor="Keil" version="1.3.1"/>
<targetInfos>
- <targetInfo name="Fixed Virtual Platform"/>
+ <targetInfo name="Simulator"/>
</targetInfos>
</component>
</components>
<files>
<file attr="config" category="source" name="CMSIS\RTOS2\RTX\Config\RTX_Config.c" version="5.1.0">
<instance index="0">RTE\CMSIS\RTX_Config.c</instance>
- <component Capiversion="2.1.3" Cclass="CMSIS" Cgroup="RTOS2" Csub="Keil RTX5" Cvariant="Source" Cvendor="ARM" Cversion="5.4.0" condition="RTOS2 RTX5"/>
- <package name="CMSIS" schemaVersion="1.3" url="http://www.keil.com/pack/" vendor="ARM" version="5.3.1-dev7"/>
+ <component Capiversion="2.1.3" Cclass="CMSIS" Cgroup="RTOS2" Csub="Keil RTX5" Cvariant="Source" Cvendor="ARM" Cversion="5.5.0" condition="RTOS2 RTX5"/>
+ <package name="CMSIS" schemaVersion="1.3" url="http://www.keil.com/pack/" vendor="ARM" version="5.5.0-dev2"/>
<targetInfos>
- <targetInfo name="Fixed Virtual Platform"/>
+ <targetInfo name="Simulator"/>
</targetInfos>
</file>
<file attr="config" category="header" name="CMSIS\RTOS2\RTX\Config\RTX_Config.h" version="5.4.0">
<instance index="0">RTE\CMSIS\RTX_Config.h</instance>
- <component Capiversion="2.1.3" Cclass="CMSIS" Cgroup="RTOS2" Csub="Keil RTX5" Cvariant="Source" Cvendor="ARM" Cversion="5.4.0" condition="RTOS2 RTX5"/>
- <package name="CMSIS" schemaVersion="1.3" url="http://www.keil.com/pack/" vendor="ARM" version="5.3.1-dev7"/>
+ <component Capiversion="2.1.3" Cclass="CMSIS" Cgroup="RTOS2" Csub="Keil RTX5" Cvariant="Source" Cvendor="ARM" Cversion="5.5.0" condition="RTOS2 RTX5"/>
+ <package name="CMSIS" schemaVersion="1.3" url="http://www.keil.com/pack/" vendor="ARM" version="5.5.0-dev2"/>
<targetInfos>
- <targetInfo name="Fixed Virtual Platform"/>
+ <targetInfo name="Simulator"/>
</targetInfos>
</file>
<file attr="config" category="header" name="Config\EventRecorderConf.h" version="1.0.0">
<instance index="0">RTE\Compiler\EventRecorderConf.h</instance>
<component Cbundle="ARM Compiler" Cclass="Compiler" Cgroup="Event Recorder" Cvariant="DAP" Cvendor="Keil" Cversion="1.4.0" condition="Cortex-M Device"/>
- <package name="ARM_Compiler" schemaVersion="1.4.9" url="http://www.keil.com/pack/" vendor="Keil" version="1.4.0"/>
+ <package name="ARM_Compiler" schemaVersion="1.4.9" url="http://www.keil.com/pack/" vendor="Keil" version="1.6.1"/>
<targetInfos>
- <targetInfo name="Fixed Virtual Platform"/>
+ <targetInfo name="Simulator"/>
</targetInfos>
</file>
<file attr="config" category="sourceAsm" condition="ARMCC" name="Device\ARM\ARMCM3\Source\ARM\startup_ARMCM3.s" version="1.0.0">
<instance index="0">RTE\Device\ARMCM3\startup_ARMCM3.s</instance>
<component Cclass="Device" Cgroup="Startup" Cvendor="ARM" Cversion="1.0.1" condition="ARMCM3 CMSIS"/>
- <package name="CMSIS" schemaVersion="1.3" url="http://www.keil.com/pack/" vendor="ARM" version="5.3.1-dev7"/>
+ <package name="CMSIS" schemaVersion="1.3" url="http://www.keil.com/pack/" vendor="ARM" version="5.5.0-dev2"/>
<targetInfos>
- <targetInfo name="Fixed Virtual Platform"/>
+ <targetInfo name="Simulator"/>
</targetInfos>
</file>
<file attr="config" category="sourceC" name="Device\ARM\ARMCM3\Source\system_ARMCM3.c" version="1.0.0">
<instance index="0">RTE\Device\ARMCM3\system_ARMCM3.c</instance>
<component Cclass="Device" Cgroup="Startup" Cvendor="ARM" Cversion="1.0.1" condition="ARMCM3 CMSIS"/>
- <package name="CMSIS" schemaVersion="1.3" url="http://www.keil.com/pack/" vendor="ARM" version="5.3.1-dev7"/>
+ <package name="CMSIS" schemaVersion="1.3" url="http://www.keil.com/pack/" vendor="ARM" version="5.5.0-dev2"/>
<targetInfos>
- <targetInfo name="Fixed Virtual Platform"/>
+ <targetInfo name="Simulator"/>
</targetInfos>
</file>
</files>
diff --git a/CMSIS/RTOS2/RTX/Examples/MemPool/RTE/Compiler/EventRecorderConf.h b/CMSIS/RTOS2/RTX/Examples/MemPool/RTE/Compiler/EventRecorderConf.h
index b2086e0..bec8f92 100644
--- a/CMSIS/RTOS2/RTX/Examples/MemPool/RTE/Compiler/EventRecorderConf.h
+++ b/CMSIS/RTOS2/RTX/Examples/MemPool/RTE/Compiler/EventRecorderConf.h
@@ -24,7 +24,7 @@
// <0=> DWT Cycle Counter <1=> SysTick
// <3=> User Timer (Normal Reset) <4=> User Timer (Power-On Reset)
// <i>Selects source for 32-bit time stamp
-#define EVENT_TIMESTAMP_SOURCE 0
+#define EVENT_TIMESTAMP_SOURCE 2
// <h>SysTick Configuration
// <i>Configure values when Time Stamp Source is set to SysTick