Skip to content

Commit

Permalink
update conditions
Browse files Browse the repository at this point in the history
  • Loading branch information
@GorgonMeducer
GorgonMeducer committed Jul 27, 2024
1 parent a1c8e68 commit 7d48163
Show file tree
Hide file tree
Showing 3 changed files with 20 additions and 24 deletions.
3 changes: 2 additions & 1 deletion .gitignore
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,4 +19,5 @@ documents/Doxygen
RTE_Components.h
*uvgui.*
*uvguix.*
example/ArInp.bat
ArInp.bat
Pre_Include_Global.h
17 changes: 12 additions & 5 deletions GorgonMeducer.perf_counter.pdsc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -125,6 +125,13 @@
</keywords>

<conditions>

<condition id="Arm Compiler 6">
<description>Arm Compiler 6 (armclang).</description>
<accept Tcompiler="ARMCC" Toptions="AC6"/>
<accept Tcompiler="ARMCC" Toptions="AC6LTO"/>
</condition>

<condition id="Arm Compiler">
<description>Arm Compiler 5 (armcc) or Arm Compiler 6 (armclang).</description>
<accept Tcompiler="ARMCC" Toptions="AC6"/>
Expand Down Expand Up @@ -240,17 +247,17 @@
</condition>

<condition id="Previous Generation Cortex-M Arm Compiler CMSIS-CORE Default Porting">
<description>Compile Cortex-M Processors with GNU Tools for Arm Embedded Processors.</description>
<require condition="Arm Compiler"/>
<description>Compile Cortex-M Processors with Arm Compiler 5.</description>
<require Tcompiler="ARMCC" Toptions="AC5"/>
<require condition="Previous Generation Cortex-M Processors"/>
<require condition="CMSIS-CORE"/>
<require condition="Default Porting"/>
</condition>

<condition id="Armv8-M Arm Compiler CMSIS-CORE Default Porting">
<description>Compile Cortex-M Processors with GNU Tools for Arm Embedded Processors.</description>
<require condition="Arm Compiler"/>
<require condition="Armv8-M Processors"/>
<description>Compile Cortex-M Processors with Arm Compiler 6.</description>
<require condition="Arm Compiler 6"/>
<require condition="Cortex-M Processors"/>
<require condition="CMSIS-CORE"/>
<require condition="Default Porting"/>
</condition>
Expand Down
24 changes: 6 additions & 18 deletions example/example.uvprojx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1537,15 +1537,9 @@
<filter>
<targetInfos/>
</filter>
<package name="Arm-2D" vendor="ARM">
<targetInfos>
<targetInfo name="example_arm_compiler_6"/>
</targetInfos>
</package>
<package name="CMSIS" schemaVersion="1.7.7" url="http://www.keil.com/pack/" vendor="ARM" version="5.9.0">
<targetInfos>
<targetInfo name="example_arm compiler_5" versionMatchMode="fixed"/>
<targetInfo name="example_arm_compiler_6" versionMatchMode="fixed"/>
</targetInfos>
</package>
<package name="Cortex_DFP" vendor="ARM" version="1.1.0">
Expand All @@ -1556,7 +1550,6 @@
<package name="ARM_Compiler" schemaVersion="1.7.7" url="https://www.keil.com/pack/" vendor="Keil" version="1.7.2">
<targetInfos>
<targetInfo name="example_arm compiler_5" versionMatchMode="fixed"/>
<targetInfo name="example_arm_compiler_6" versionMatchMode="fixed"/>
</targetInfos>
</package>
</packages>
Expand All @@ -1583,26 +1576,21 @@
<package name="CMSIS" schemaVersion="1.7.7" url="http://www.keil.com/pack/" vendor="ARM" version="5.9.0"/>
<targetInfos>
<targetInfo name="example_arm compiler_5"/>
<targetInfo name="example_arm_compiler_6"/>
</targetInfos>
</component>
<component Cclass="CMSIS" Cgroup="CORE" Cvendor="ARM" Cversion="6.1.0" condition="ARMv6_7_8-M Device">
<package name="CMSIS" schemaVersion="1.7.36" url="https://www.keil.com/pack/" vendor="ARM" version="6.1.0"/>
<targetInfos>
<targetInfo name="example_arm_compiler_6"/>
<targetInfo name="library"/>
</targetInfos>
</component>
<component Cclass="Device" Cgroup="Startup" Cvariant="C Startup" Cvendor="ARM" Cversion="2.2.0" condition="ARMCM0 CMSIS">
<package name="Cortex_DFP" schemaVersion="1.7.7" url="https://www.keil.com/pack/" vendor="ARM" version="1.0.0"/>
<targetInfos>
<targetInfo name="example_arm compiler_5"/>
<targetInfo name="library"/>
</targetInfos>
</component>
<component Cclass="Device" Cgroup="Startup" Cvendor="ARM" Cversion="1.2.2" condition="ARMCM0 CMSIS">
<package name="CMSIS" schemaVersion="1.7.7" url="http://www.keil.com/pack/" vendor="ARM" version="5.9.0"/>
<targetInfos>
<targetInfo name="example_arm_compiler_6"/>
<targetInfo name="library"/>
</targetInfos>
</component>
<component Cbundle="ARM Compiler" Cclass="Compiler" Cgroup="Event Recorder" Cvariant="DAP" Cvendor="Keil" Cversion="1.5.1" condition="Cortex-M Device">
Expand Down Expand Up @@ -1639,6 +1627,7 @@
<package name="Cortex_DFP" schemaVersion="1.7.33" url="https://www.keil.com/pack/" vendor="ARM" version="1.1.0"/>
<targetInfos>
<targetInfo name="example_arm compiler_5"/>
<targetInfo name="example_arm_compiler_6"/>
<targetInfo name="library"/>
</targetInfos>
</file>
Expand All @@ -1648,16 +1637,15 @@
<package name="Cortex_DFP" schemaVersion="1.7.33" url="https://www.keil.com/pack/" vendor="ARM" version="1.1.0"/>
<targetInfos>
<targetInfo name="example_arm compiler_5"/>
<targetInfo name="example_arm_compiler_6"/>
<targetInfo name="library"/>
</targetInfos>
</file>
<file attr="config" category="sourceAsm" condition="ARMCC" name="Device\ARM\ARMCM0\Source\ARM\startup_ARMCM0.s" version="1.0.1">
<instance index="0">RTE\Device\ARMCM0\startup_ARMCM0.s</instance>
<instance index="0" removed="1">RTE\Device\ARMCM0\startup_ARMCM0.s</instance>
<component Cclass="Device" Cgroup="Startup" Cvendor="ARM" Cversion="1.2.2" condition="ARMCM0 CMSIS"/>
<package name="CMSIS" schemaVersion="1.7.7" url="http://www.keil.com/pack/" vendor="ARM" version="5.9.0"/>
<targetInfos>
<targetInfo name="example_arm_compiler_6"/>
</targetInfos>
<targetInfos/>
</file>
<file attr="config" category="sourceC" name="Device\ARMCM0\Source\system_ARMCM0.c" version="1.0.0">
<instance index="0">RTE\Device\ARMCM0\system_ARMCM0.c</instance>
Expand Down

0 comments on commit 7d48163

Please sign in to comment.