From e1fabca3b76cacbf5bf96782d945b3c822efb50c Mon Sep 17 00:00:00 2001
From: Robert Rostohar <robert.rostohar@arm.com>
Date: Tue, 19 Dec 2023 11:35:14 +0100
Subject: [PATCH] Update examples (pack versions)

---
 .../NonSecure/Fault_NS.cproject.yml           |  2 +-
 .../B-U585I-IOT02A/NonSecure/Fault_NS.uvoptx  | 12 +++----
 .../B-U585I-IOT02A/NonSecure/Fault_NS.uvprojx | 33 +++++++++++--------
 .../B-U585I-IOT02A/Secure/Fault_S.uvoptx      |  4 +--
 .../B-U585I-IOT02A/Secure/Fault_S.uvprojx     | 13 +++++---
 .../VHT_MPS2_Cortex-M7/Fault.cproject.yml     |  2 +-
 6 files changed, 38 insertions(+), 28 deletions(-)

diff --git a/Examples/Fault/B-U585I-IOT02A/NonSecure/Fault_NS.cproject.yml b/Examples/Fault/B-U585I-IOT02A/NonSecure/Fault_NS.cproject.yml
index d20b852..0cc0a9a 100644
--- a/Examples/Fault/B-U585I-IOT02A/NonSecure/Fault_NS.cproject.yml
+++ b/Examples/Fault/B-U585I-IOT02A/NonSecure/Fault_NS.cproject.yml
@@ -5,7 +5,7 @@ project:
 
   packs:
     - pack: ARM::CMSIS@>=6.0.0-0
-    - pack: ARM::CMSIS-RTX@>=1.0.0-0
+    - pack: ARM::CMSIS-RTX@>=5.8.0-0
     - pack: ARM::CMSIS-Compiler@>=2.0.0-0
     - pack: ARM::CMSIS-View
 
diff --git a/Examples/Fault/B-U585I-IOT02A/NonSecure/Fault_NS.uvoptx b/Examples/Fault/B-U585I-IOT02A/NonSecure/Fault_NS.uvoptx
index 97e0f9a..b982d41 100644
--- a/Examples/Fault/B-U585I-IOT02A/NonSecure/Fault_NS.uvoptx
+++ b/Examples/Fault/B-U585I-IOT02A/NonSecure/Fault_NS.uvoptx
@@ -160,18 +160,18 @@
         <SubType>1</SubType>
       </ScvdList>
       <ScvdPack>
-        <Filename>C:\Arm\Packs\ARM\CMSIS-View\1.0.1\EventRecorder\EventRecorder.scvd</Filename>
-        <Type>ARM.CMSIS-View.1.0.1</Type>
+        <Filename>C:\Arm\Packs\ARM\CMSIS-View\1.1.0\EventRecorder\EventRecorder.scvd</Filename>
+        <Type>ARM::CMSIS-View@1.1.0</Type>
         <SubType>1</SubType>
       </ScvdPack>
       <ScvdPack>
-        <Filename>C:\Arm\Packs\ARM\CMSIS-View\1.0.1\Fault\ARM_Fault.scvd</Filename>
-        <Type>ARM.CMSIS-View.1.0.1</Type>
+        <Filename>C:\Arm\Packs\ARM\CMSIS-View\1.1.0\Fault\ARM_Fault.scvd</Filename>
+        <Type>ARM::CMSIS-View@1.1.0</Type>
         <SubType>1</SubType>
       </ScvdPack>
       <ScvdPack>
-        <Filename>C:\Arm\Packs\ARM\CMSIS-RTX\1.0.0\RTX5.scvd</Filename>
-        <Type>ARM.CMSIS-RTX.1.0.0</Type>
+        <Filename>C:\Arm\Packs\ARM\CMSIS-RTX\5.8.0\RTX5.scvd</Filename>
+        <Type>ARM::CMSIS-RTX@5.8.0</Type>
         <SubType>1</SubType>
       </ScvdPack>
       <Tracepoint>
diff --git a/Examples/Fault/B-U585I-IOT02A/NonSecure/Fault_NS.uvprojx b/Examples/Fault/B-U585I-IOT02A/NonSecure/Fault_NS.uvprojx
index 40b9a17..750a3c7 100644
--- a/Examples/Fault/B-U585I-IOT02A/NonSecure/Fault_NS.uvprojx
+++ b/Examples/Fault/B-U585I-IOT02A/NonSecure/Fault_NS.uvprojx
@@ -10,8 +10,7 @@
       <TargetName>B-U585I-IOT02A</TargetName>
       <ToolsetNumber>0x4</ToolsetNumber>
       <ToolsetName>ARM-ADS</ToolsetName>
-      <pArmCC>6190000::V6.19::ARMCLANG</pArmCC>
-      <pCCUsed>6190000::V6.19::ARMCLANG</pCCUsed>
+      <pCCUsed>6210000::V6.21::ARMCLANG</pCCUsed>
       <uAC6>1</uAC6>
       <TargetOption>
         <TargetCommonOption>
@@ -338,7 +337,7 @@
             <v6WtE>0</v6WtE>
             <v6Rtti>0</v6Rtti>
             <VariousControls>
-              <MiscControls></MiscControls>
+              <MiscControls>-Wno-unsafe-buffer-usage</MiscControls>
               <Define>RTE_Compiler_EventRecorder, RTE_Compiler_EventRecorder_DAP</Define>
               <Undefine></Undefine>
               <IncludePath></IncludePath>
@@ -695,12 +694,12 @@
           <targetInfo name="B-U585I-IOT02A" versionMatchMode="fixed"/>
         </targetInfos>
       </package>
-      <package name="CMSIS-RTX" schemaVersion="1.7.27" url="https://www.keil.com/pack/" vendor="ARM" version="1.0.0">
+      <package name="CMSIS-RTX" vendor="ARM" version="5.8.0">
         <targetInfos>
           <targetInfo name="B-U585I-IOT02A" versionMatchMode="fixed"/>
         </targetInfos>
       </package>
-      <package name="CMSIS-View" schemaVersion="1.7.7" url="http://www.keil.com/pack/" vendor="ARM" version="1.0.1">
+      <package name="CMSIS-View" vendor="ARM">
         <targetInfos>
           <targetInfo name="B-U585I-IOT02A"/>
         </targetInfos>
@@ -767,8 +766,8 @@
           <targetInfo name="B-U585I-IOT02A"/>
         </targetInfos>
       </api>
-      <api Capiversion="2.1.3" Cclass="CMSIS" Cgroup="RTOS2" exclusive="1">
-        <package name="CMSIS" schemaVersion="1.7.7" url="http://www.keil.com/pack/" vendor="ARM" version="5.9.0"/>
+      <api Capiversion="2.3.0" Cclass="CMSIS" Cgroup="RTOS2" exclusive="1">
+        <package name="CMSIS" schemaVersion="1.7.7" url="https://www.keil.com/pack/" vendor="ARM" version="6.0.0"/>
         <targetInfos>
           <targetInfo name="B-U585I-IOT02A"/>
         </targetInfos>
@@ -849,8 +848,14 @@
           <targetInfo name="B-U585I-IOT02A"/>
         </targetInfos>
       </component>
-      <component Capiversion="2.2.0" Cclass="CMSIS" Cgroup="RTOS2" Csub="Keil RTX5" Cvariant="Source" Cvendor="ARM" Cversion="5.7.0" condition="RTX5 NS">
-        <package name="CMSIS-RTX" schemaVersion="1.7.27" url="https://www.keil.com/pack/" vendor="ARM" version="1.0.0"/>
+      <component Capiversion="2.3.0" Cclass="CMSIS" Cgroup="RTOS2" Csub="Keil RTX5" Cvariant="Source" Cvendor="ARM" Cversion="5.8.0" condition="RTX5 NS">
+        <package name="CMSIS-RTX" schemaVersion="1.7.27" url="https://www.keil.com/pack/" vendor="ARM" version="5.8.0"/>
+        <targetInfos>
+          <targetInfo name="B-U585I-IOT02A"/>
+        </targetInfos>
+      </component>
+      <component Cclass="Device" Cgroup="STM32Cube Framework" Csub="STM32CubeMX" Cvendor="Keil" Cversion="2.0.0" condition="STCubeMX" doc="C:/Arm/Packs/Keil/STM32U5xx_DFP/2.1.0/MDK/CubeMX/Documentation/cubemx.html" generated="1" generator="STM32CubeMX_NS" selectable="1">
+        <package name="STM32U5xx_DFP" schemaVersion="1.7.15" url="https://www.keil.com/pack/" vendor="Keil" version="2.1.0"/>
         <targetInfos>
           <targetInfo name="B-U585I-IOT02A"/>
         </targetInfos>
@@ -924,23 +929,23 @@
       <file attr="config" category="header" name="EventRecorder\Config\EventRecorderConf.h" version="1.1.0">
         <instance index="0">RTE\CMSIS-View\EventRecorderConf.h</instance>
         <component Cclass="CMSIS-View" Cgroup="Event Recorder" Cvariant="DAP" Cvendor="ARM" Cversion="1.5.3" condition="EventRecorder"/>
-        <package name="CMSIS-View" schemaVersion="1.7.25" url="https://www.keil.com/pack/" vendor="ARM" version="1.0.1"/>
+        <package name="CMSIS-View" schemaVersion="1.7.25" url="https://www.keil.com/pack/" vendor="ARM" version="1.1.0"/>
         <targetInfos>
           <targetInfo name="B-U585I-IOT02A"/>
         </targetInfos>
       </file>
       <file attr="config" category="source" name="Config\RTX_Config.c" version="5.2.0">
         <instance index="0">RTE\CMSIS\RTX_Config.c</instance>
-        <component Capiversion="2.2.0" Cclass="CMSIS" Cgroup="RTOS2" Csub="Keil RTX5" Cvariant="Source" Cvendor="ARM" Cversion="5.7.0" condition="RTX5 NS"/>
-        <package name="CMSIS-RTX" schemaVersion="1.7.27" url="https://www.keil.com/pack/" vendor="ARM" version="1.0.0"/>
+        <component Capiversion="2.3.0" Cclass="CMSIS" Cgroup="RTOS2" Csub="Keil RTX5" Cvariant="Source" Cvendor="ARM" Cversion="5.8.0" condition="RTX5 NS"/>
+        <package name="CMSIS-RTX" schemaVersion="1.7.27" url="https://www.keil.com/pack/" vendor="ARM" version="5.8.0"/>
         <targetInfos>
           <targetInfo name="B-U585I-IOT02A"/>
         </targetInfos>
       </file>
       <file attr="config" category="header" name="Config\RTX_Config.h" version="5.6.0">
         <instance index="0">RTE\CMSIS\RTX_Config.h</instance>
-        <component Capiversion="2.2.0" Cclass="CMSIS" Cgroup="RTOS2" Csub="Keil RTX5" Cvariant="Source" Cvendor="ARM" Cversion="5.7.0" condition="RTX5 NS"/>
-        <package name="CMSIS-RTX" schemaVersion="1.7.27" url="https://www.keil.com/pack/" vendor="ARM" version="1.0.0"/>
+        <component Capiversion="2.3.0" Cclass="CMSIS" Cgroup="RTOS2" Csub="Keil RTX5" Cvariant="Source" Cvendor="ARM" Cversion="5.8.0" condition="RTX5 NS"/>
+        <package name="CMSIS-RTX" schemaVersion="1.7.27" url="https://www.keil.com/pack/" vendor="ARM" version="5.8.0"/>
         <targetInfos>
           <targetInfo name="B-U585I-IOT02A"/>
         </targetInfos>
diff --git a/Examples/Fault/B-U585I-IOT02A/Secure/Fault_S.uvoptx b/Examples/Fault/B-U585I-IOT02A/Secure/Fault_S.uvoptx
index ed9091a..90c5591 100644
--- a/Examples/Fault/B-U585I-IOT02A/Secure/Fault_S.uvoptx
+++ b/Examples/Fault/B-U585I-IOT02A/Secure/Fault_S.uvoptx
@@ -150,8 +150,8 @@
       </TargetDriverDllRegistry>
       <Breakpoint/>
       <ScvdPack>
-        <Filename>C:\Arm\Packs\ARM\CMSIS-View\1.0.1\Fault\ARM_Fault.scvd</Filename>
-        <Type>ARM.CMSIS-View.1.0.1</Type>
+        <Filename>C:\Arm\Packs\ARM\CMSIS-View\1.1.0\Fault\ARM_Fault.scvd</Filename>
+        <Type>ARM::CMSIS-View@1.1.0</Type>
         <SubType>1</SubType>
       </ScvdPack>
       <Tracepoint>
diff --git a/Examples/Fault/B-U585I-IOT02A/Secure/Fault_S.uvprojx b/Examples/Fault/B-U585I-IOT02A/Secure/Fault_S.uvprojx
index d197ac4..96c584d 100644
--- a/Examples/Fault/B-U585I-IOT02A/Secure/Fault_S.uvprojx
+++ b/Examples/Fault/B-U585I-IOT02A/Secure/Fault_S.uvprojx
@@ -10,8 +10,7 @@
       <TargetName>B-U585I-IOT02A</TargetName>
       <ToolsetNumber>0x4</ToolsetNumber>
       <ToolsetName>ARM-ADS</ToolsetName>
-      <pArmCC>6190000::V6.19::ARMCLANG</pArmCC>
-      <pCCUsed>6190000::V6.19::ARMCLANG</pCCUsed>
+      <pCCUsed>6210000::V6.21::ARMCLANG</pCCUsed>
       <uAC6>1</uAC6>
       <TargetOption>
         <TargetCommonOption>
@@ -338,7 +337,7 @@
             <v6WtE>0</v6WtE>
             <v6Rtti>0</v6Rtti>
             <VariousControls>
-              <MiscControls></MiscControls>
+              <MiscControls>-Wno-unsafe-buffer-usage</MiscControls>
               <Define></Define>
               <Undefine></Undefine>
               <IncludePath></IncludePath>
@@ -675,7 +674,7 @@
           <targetInfo name="B-U585I-IOT02A" versionMatchMode="fixed"/>
         </targetInfos>
       </package>
-      <package name="CMSIS-View" schemaVersion="1.7.25" url="https://www.keil.com/pack/" vendor="ARM" version="1.0.1">
+      <package name="CMSIS-View" vendor="ARM">
         <targetInfos>
           <targetInfo name="B-U585I-IOT02A"/>
         </targetInfos>
@@ -778,6 +777,12 @@
           <targetInfo name="B-U585I-IOT02A"/>
         </targetInfos>
       </component>
+      <component Cclass="Device" Cgroup="STM32Cube Framework" Csub="STM32CubeMX" Cvendor="Keil" Cversion="2.0.0" condition="STCubeMX" doc="C:/Arm/Packs/Keil/STM32U5xx_DFP/2.1.0/MDK/CubeMX/Documentation/cubemx.html" generated="1" generator="STM32CubeMX_S" selectable="1">
+        <package name="STM32U5xx_DFP" schemaVersion="1.7.15" url="https://www.keil.com/pack/" vendor="Keil" version="2.1.0"/>
+        <targetInfos>
+          <targetInfo name="B-U585I-IOT02A"/>
+        </targetInfos>
+      </component>
       <component Cclass="Device" Cgroup="STM32Cube HAL" Csub="Common" Cvendor="Keil" Cversion="1.2.0" condition="STM32U5 HAL Common">
         <package name="STM32U5xx_DFP" schemaVersion="1.7.15" url="https://www.keil.com/pack/" vendor="Keil" version="2.1.0"/>
         <targetInfos>
diff --git a/Examples/Fault/VHT_MPS2_Cortex-M7/Fault.cproject.yml b/Examples/Fault/VHT_MPS2_Cortex-M7/Fault.cproject.yml
index 591c89f..2fb0e0d 100644
--- a/Examples/Fault/VHT_MPS2_Cortex-M7/Fault.cproject.yml
+++ b/Examples/Fault/VHT_MPS2_Cortex-M7/Fault.cproject.yml
@@ -2,7 +2,7 @@ project:
 
   packs:
     - pack: ARM::CMSIS@>=6.0.0-0
-    - pack: ARM::CMSIS-RTX@>=1.0.0-0
+    - pack: ARM::CMSIS-RTX@>=5.8.0-0
     - pack: ARM::CMSIS-Compiler@>=2.0.0-0
     - pack: ARM::CMSIS-View