Skip to content

Commit e1fabca

Browse files
RobertRostoharRobertRostohar
committed
Update examples (pack versions)
1 parent f281cda commit e1fabca

File tree

6 files changed

+38
-28
lines changed

6 files changed

+38
-28
lines changed

‎Examples/Fault/B-U585I-IOT02A/NonSecure/Fault_NS.cproject.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ project:
55

66
packs:
77
- pack: ARM::CMSIS@>=6.0.0-0
8-
- pack: ARM::CMSIS-RTX@>=1.0.0-0
8+
- pack: ARM::CMSIS-RTX@>=5.8.0-0
99
- pack: ARM::CMSIS-Compiler@>=2.0.0-0
1010
- pack: ARM::CMSIS-View
1111

‎Examples/Fault/B-U585I-IOT02A/NonSecure/Fault_NS.uvoptx‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -160,18 +160,18 @@
160160
<SubType>1</SubType>
161161
</ScvdList>
162162
<ScvdPack>
163-
<Filename>C:\Arm\Packs\ARM\CMSIS-View\1.0.1\EventRecorder\EventRecorder.scvd</Filename>
164-
<Type>ARM.CMSIS-View.1.0.1</Type>
163+
<Filename>C:\Arm\Packs\ARM\CMSIS-View\1.1.0\EventRecorder\EventRecorder.scvd</Filename>
164+
<Type>ARM::CMSIS-View@1.1.0</Type>
165165
<SubType>1</SubType>
166166
</ScvdPack>
167167
<ScvdPack>
168-
<Filename>C:\Arm\Packs\ARM\CMSIS-View\1.0.1\Fault\ARM_Fault.scvd</Filename>
169-
<Type>ARM.CMSIS-View.1.0.1</Type>
168+
<Filename>C:\Arm\Packs\ARM\CMSIS-View\1.1.0\Fault\ARM_Fault.scvd</Filename>
169+
<Type>ARM::CMSIS-View@1.1.0</Type>
170170
<SubType>1</SubType>
171171
</ScvdPack>
172172
<ScvdPack>
173-
<Filename>C:\Arm\Packs\ARM\CMSIS-RTX\1.0.0\RTX5.scvd</Filename>
174-
<Type>ARM.CMSIS-RTX.1.0.0</Type>
173+
<Filename>C:\Arm\Packs\ARM\CMSIS-RTX\5.8.0\RTX5.scvd</Filename>
174+
<Type>ARM::CMSIS-RTX@5.8.0</Type>
175175
<SubType>1</SubType>
176176
</ScvdPack>
177177
<Tracepoint>

‎Examples/Fault/B-U585I-IOT02A/NonSecure/Fault_NS.uvprojx‎

Lines changed: 19 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,7 @@
1010
<TargetName>B-U585I-IOT02A</TargetName>
1111
<ToolsetNumber>0x4</ToolsetNumber>
1212
<ToolsetName>ARM-ADS</ToolsetName>
13-
<pArmCC>6190000::V6.19::ARMCLANG</pArmCC>
14-
<pCCUsed>6190000::V6.19::ARMCLANG</pCCUsed>
13+
<pCCUsed>6210000::V6.21::ARMCLANG</pCCUsed>
1514
<uAC6>1</uAC6>
1615
<TargetOption>
1716
<TargetCommonOption>
@@ -338,7 +337,7 @@
338337
<v6WtE>0</v6WtE>
339338
<v6Rtti>0</v6Rtti>
340339
<VariousControls>
341-
<MiscControls></MiscControls>
340+
<MiscControls>-Wno-unsafe-buffer-usage</MiscControls>
342341
<Define>RTE_Compiler_EventRecorder, RTE_Compiler_EventRecorder_DAP</Define>
343342
<Undefine></Undefine>
344343
<IncludePath></IncludePath>
@@ -695,12 +694,12 @@
695694
<targetInfo name="B-U585I-IOT02A" versionMatchMode="fixed"/>
696695
</targetInfos>
697696
</package>
698-
<package name="CMSIS-RTX" schemaVersion="1.7.27" url="https://www.keil.com/pack/" vendor="ARM" version="1.0.0">
697+
<package name="CMSIS-RTX" vendor="ARM" version="5.8.0">
699698
<targetInfos>
700699
<targetInfo name="B-U585I-IOT02A" versionMatchMode="fixed"/>
701700
</targetInfos>
702701
</package>
703-
<package name="CMSIS-View" schemaVersion="1.7.7" url="http://www.keil.com/pack/" vendor="ARM" version="1.0.1">
702+
<package name="CMSIS-View" vendor="ARM">
704703
<targetInfos>
705704
<targetInfo name="B-U585I-IOT02A"/>
706705
</targetInfos>
@@ -767,8 +766,8 @@
767766
<targetInfo name="B-U585I-IOT02A"/>
768767
</targetInfos>
769768
</api>
770-
<api Capiversion="2.1.3" Cclass="CMSIS" Cgroup="RTOS2" exclusive="1">
771-
<package name="CMSIS" schemaVersion="1.7.7" url="http://www.keil.com/pack/" vendor="ARM" version="5.9.0"/>
769+
<api Capiversion="2.3.0" Cclass="CMSIS" Cgroup="RTOS2" exclusive="1">
770+
<package name="CMSIS" schemaVersion="1.7.7" url="https://www.keil.com/pack/" vendor="ARM" version="6.0.0"/>
772771
<targetInfos>
773772
<targetInfo name="B-U585I-IOT02A"/>
774773
</targetInfos>
@@ -849,8 +848,14 @@
849848
<targetInfo name="B-U585I-IOT02A"/>
850849
</targetInfos>
851850
</component>
852-
<component Capiversion="2.2.0" Cclass="CMSIS" Cgroup="RTOS2" Csub="Keil RTX5" Cvariant="Source" Cvendor="ARM" Cversion="5.7.0" condition="RTX5 NS">
853-
<package name="CMSIS-RTX" schemaVersion="1.7.27" url="https://www.keil.com/pack/" vendor="ARM" version="1.0.0"/>
851+
<component Capiversion="2.3.0" Cclass="CMSIS" Cgroup="RTOS2" Csub="Keil RTX5" Cvariant="Source" Cvendor="ARM" Cversion="5.8.0" condition="RTX5 NS">
852+
<package name="CMSIS-RTX" schemaVersion="1.7.27" url="https://www.keil.com/pack/" vendor="ARM" version="5.8.0"/>
853+
<targetInfos>
854+
<targetInfo name="B-U585I-IOT02A"/>
855+
</targetInfos>
856+
</component>
857+
<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">
858+
<package name="STM32U5xx_DFP" schemaVersion="1.7.15" url="https://www.keil.com/pack/" vendor="Keil" version="2.1.0"/>
854859
<targetInfos>
855860
<targetInfo name="B-U585I-IOT02A"/>
856861
</targetInfos>
@@ -924,23 +929,23 @@
924929
<file attr="config" category="header" name="EventRecorder\Config\EventRecorderConf.h" version="1.1.0">
925930
<instance index="0">RTE\CMSIS-View\EventRecorderConf.h</instance>
926931
<component Cclass="CMSIS-View" Cgroup="Event Recorder" Cvariant="DAP" Cvendor="ARM" Cversion="1.5.3" condition="EventRecorder"/>
927-
<package name="CMSIS-View" schemaVersion="1.7.25" url="https://www.keil.com/pack/" vendor="ARM" version="1.0.1"/>
932+
<package name="CMSIS-View" schemaVersion="1.7.25" url="https://www.keil.com/pack/" vendor="ARM" version="1.1.0"/>
928933
<targetInfos>
929934
<targetInfo name="B-U585I-IOT02A"/>
930935
</targetInfos>
931936
</file>
932937
<file attr="config" category="source" name="Config\RTX_Config.c" version="5.2.0">
933938
<instance index="0">RTE\CMSIS\RTX_Config.c</instance>
934-
<component Capiversion="2.2.0" Cclass="CMSIS" Cgroup="RTOS2" Csub="Keil RTX5" Cvariant="Source" Cvendor="ARM" Cversion="5.7.0" condition="RTX5 NS"/>
935-
<package name="CMSIS-RTX" schemaVersion="1.7.27" url="https://www.keil.com/pack/" vendor="ARM" version="1.0.0"/>
939+
<component Capiversion="2.3.0" Cclass="CMSIS" Cgroup="RTOS2" Csub="Keil RTX5" Cvariant="Source" Cvendor="ARM" Cversion="5.8.0" condition="RTX5 NS"/>
940+
<package name="CMSIS-RTX" schemaVersion="1.7.27" url="https://www.keil.com/pack/" vendor="ARM" version="5.8.0"/>
936941
<targetInfos>
937942
<targetInfo name="B-U585I-IOT02A"/>
938943
</targetInfos>
939944
</file>
940945
<file attr="config" category="header" name="Config\RTX_Config.h" version="5.6.0">
941946
<instance index="0">RTE\CMSIS\RTX_Config.h</instance>
942-
<component Capiversion="2.2.0" Cclass="CMSIS" Cgroup="RTOS2" Csub="Keil RTX5" Cvariant="Source" Cvendor="ARM" Cversion="5.7.0" condition="RTX5 NS"/>
943-
<package name="CMSIS-RTX" schemaVersion="1.7.27" url="https://www.keil.com/pack/" vendor="ARM" version="1.0.0"/>
947+
<component Capiversion="2.3.0" Cclass="CMSIS" Cgroup="RTOS2" Csub="Keil RTX5" Cvariant="Source" Cvendor="ARM" Cversion="5.8.0" condition="RTX5 NS"/>
948+
<package name="CMSIS-RTX" schemaVersion="1.7.27" url="https://www.keil.com/pack/" vendor="ARM" version="5.8.0"/>
944949
<targetInfos>
945950
<targetInfo name="B-U585I-IOT02A"/>
946951
</targetInfos>

‎Examples/Fault/B-U585I-IOT02A/Secure/Fault_S.uvoptx‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -150,8 +150,8 @@
150150
</TargetDriverDllRegistry>
151151
<Breakpoint/>
152152
<ScvdPack>
153-
<Filename>C:\Arm\Packs\ARM\CMSIS-View\1.0.1\Fault\ARM_Fault.scvd</Filename>
154-
<Type>ARM.CMSIS-View.1.0.1</Type>
153+
<Filename>C:\Arm\Packs\ARM\CMSIS-View\1.1.0\Fault\ARM_Fault.scvd</Filename>
154+
<Type>ARM::CMSIS-View@1.1.0</Type>
155155
<SubType>1</SubType>
156156
</ScvdPack>
157157
<Tracepoint>

‎Examples/Fault/B-U585I-IOT02A/Secure/Fault_S.uvprojx‎

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,7 @@
1010
<TargetName>B-U585I-IOT02A</TargetName>
1111
<ToolsetNumber>0x4</ToolsetNumber>
1212
<ToolsetName>ARM-ADS</ToolsetName>
13-
<pArmCC>6190000::V6.19::ARMCLANG</pArmCC>
14-
<pCCUsed>6190000::V6.19::ARMCLANG</pCCUsed>
13+
<pCCUsed>6210000::V6.21::ARMCLANG</pCCUsed>
1514
<uAC6>1</uAC6>
1615
<TargetOption>
1716
<TargetCommonOption>
@@ -338,7 +337,7 @@
338337
<v6WtE>0</v6WtE>
339338
<v6Rtti>0</v6Rtti>
340339
<VariousControls>
341-
<MiscControls></MiscControls>
340+
<MiscControls>-Wno-unsafe-buffer-usage</MiscControls>
342341
<Define></Define>
343342
<Undefine></Undefine>
344343
<IncludePath></IncludePath>
@@ -675,7 +674,7 @@
675674
<targetInfo name="B-U585I-IOT02A" versionMatchMode="fixed"/>
676675
</targetInfos>
677676
</package>
678-
<package name="CMSIS-View" schemaVersion="1.7.25" url="https://www.keil.com/pack/" vendor="ARM" version="1.0.1">
677+
<package name="CMSIS-View" vendor="ARM">
679678
<targetInfos>
680679
<targetInfo name="B-U585I-IOT02A"/>
681680
</targetInfos>
@@ -778,6 +777,12 @@
778777
<targetInfo name="B-U585I-IOT02A"/>
779778
</targetInfos>
780779
</component>
780+
<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">
781+
<package name="STM32U5xx_DFP" schemaVersion="1.7.15" url="https://www.keil.com/pack/" vendor="Keil" version="2.1.0"/>
782+
<targetInfos>
783+
<targetInfo name="B-U585I-IOT02A"/>
784+
</targetInfos>
785+
</component>
781786
<component Cclass="Device" Cgroup="STM32Cube HAL" Csub="Common" Cvendor="Keil" Cversion="1.2.0" condition="STM32U5 HAL Common">
782787
<package name="STM32U5xx_DFP" schemaVersion="1.7.15" url="https://www.keil.com/pack/" vendor="Keil" version="2.1.0"/>
783788
<targetInfos>

‎Examples/Fault/VHT_MPS2_Cortex-M7/Fault.cproject.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ project:
22

33
packs:
44
- pack: ARM::CMSIS@>=6.0.0-0
5-
- pack: ARM::CMSIS-RTX@>=1.0.0-0
5+
- pack: ARM::CMSIS-RTX@>=5.8.0-0
66
- pack: ARM::CMSIS-Compiler@>=2.0.0-0
77
- pack: ARM::CMSIS-View
88

0 commit comments

Comments
 (0)