Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Updates for CMSIS 6 #90

Merged
merged 4 commits into from
Mar 8, 2024
Merged

Updates for CMSIS 6 #90

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
8cdaa15
CMSIS-RTOS2 requires CMSIS:OS Tick component
VladimirUmek Mar 8, 2024
cae2d0c
Drop support for Arm Compiler 5
VladimirUmek Mar 8, 2024
2906314
Drop support for CMSIS-RTOS1 API
VladimirUmek Mar 8, 2024
f194b24
Update standard C library hooks
VladimirUmek Mar 8, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
116 changes: 8 additions & 108 deletions ARM.CMSIS-FreeRTOS.pdsc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,11 @@

<releases>
<release version="0.0.0">
FreeRTOS 11.0.1
Active development...
- CMSIS-RTOS2 requires CMSIS:OS Tick component
- Drop support for Arm Compiler 5
- Drop support for CMSIS-RTOS1 API
</release>
</releases>

Expand All @@ -20,9 +24,6 @@
</requirements>

<conditions>
<condition id="ARMCC">
<require Tcompiler="ARMCC" Toptions="AC5"/>
</condition>
<condition id="ARMCC6">
<accept Tcompiler="ARMCC" Toptions="AC6"/>
<accept Tcompiler="ARMCC" Toptions="AC6LTO"/>
Expand Down Expand Up @@ -176,52 +177,6 @@
<accept condition="CA9_DP"/>
</condition>

<!-- ARMCC compiler -->
<condition id="CM0_ARMCC">
<description>Cortex-M0 or Cortex-M0+ or SC000 processor based device for the ARM Compiler 5</description>
<require condition="CM0"/>
<require condition="ARMCC"/>
</condition>

<condition id="CM3_ARMCC">
<description>Cortex-M3 or SC300 processor based device for the ARM Compiler 5</description>
<require condition="CM3"/>
<require condition="ARMCC"/>
</condition>

<condition id="CM4_ARMCC">
<description>Cortex-M4 processor based device for the ARM Compiler 5</description>
<require condition="CM4"/>
<require condition="ARMCC"/>
</condition>
<condition id="CM4_FP_ARMCC">
<description>Cortex-M4 processor based device using Floating Point Unit for the ARM Compiler 5</description>
<require condition="CM4_FP"/>
<require condition="ARMCC"/>
</condition>

<condition id="CM7_ARMCC">
<description>Cortex-M7 processor based device for the ARM Compiler 5</description>
<require condition="CM7"/>
<require condition="ARMCC"/>
</condition>
<condition id="CM7_SP_ARMCC">
<description>Cortex-M7 processor based device using Floating Point Unit (SP) for the ARM Compiler 5</description>
<require condition="CM7_SP"/>
<require condition="ARMCC"/>
</condition>
<condition id="CM7_DP_ARMCC">
<description>Cortex-M7 processor based device using Floating Point Unit (DP) for the ARM Compiler 5</description>
<require condition="CM7_DP"/>
<require condition="ARMCC"/>
</condition>

<condition id="CA9_DP_ARMCC">
<description>Cortex-A9 processor based device using Floating Point Unit (DP) for the ARM Compiler 5</description>
<require condition="CA9_DP"/>
<require condition="ARMCC"/>
</condition>

<!-- ARMCC6 compiler -->
<condition id="CM0_ARMCC6">
<description>Cortex-M0 or Cortex-M0+ or SC000 processor based device for the ARM Compiler 6</description>
Expand Down Expand Up @@ -573,14 +528,12 @@
<!-- FreeRTOS ports for the Arm Cortex core -->
<condition id="FreeRTOS Port Cortex-M0">
<description>Requirements for FreeRTOS port for Cortex-M0 and Cortex-M0+</description>
<accept condition="CM0_ARMCC"/>
<accept condition="CM0_ARMCC6"/>
<accept condition="CM0_GCC"/>
<accept condition="CM0_IAR"/>
</condition>
<condition id="FreeRTOS Port Cortex-M3">
<description>Requirements for FreeRTOS port for Cortex-M3</description>
<accept condition="CM3_ARMCC"/>
<accept condition="CM3_ARMCC6"/>
<accept condition="CM3_GCC"/>
<accept condition="CM3_IAR"/>
Expand All @@ -592,7 +545,6 @@
</condition>
<condition id="FreeRTOS Port Cortex-M4">
<description>Requirements for FreeRTOS port for Cortex-M4</description>
<accept condition="CM4_ARMCC"/>
<accept condition="CM4_ARMCC6"/>
<accept condition="CM4_GCC"/>
<accept condition="CM4_IAR"/>
Expand All @@ -604,35 +556,30 @@
</condition>
<condition id="FreeRTOS Port Cortex-M4 FPU">
<description>Requirements for FreeRTOS port for Cortex-M4 using FPU</description>
<accept condition="CM4_FP_ARMCC"/>
<accept condition="CM4_FP_ARMCC6"/>
<accept condition="CM4_FP_GCC"/>
<accept condition="CM4_FP_IAR"/>
</condition>
<condition id="FreeRTOS Port Cortex-M4 FPU MPU">
<description>Requirements for FreeRTOS port for Cortex-M4 using FPU and MPU</description>
<accept condition="CM4_FP_ARMCC"/>
<accept condition="CM4_FP_ARMCC6"/>
<accept condition="CM4_FP_GCC"/>
<accept condition="CM4_FP_IAR"/>
</condition>
<condition id="FreeRTOS Port Cortex-M7">
<description>Requirements for FreeRTOS port for Cortex-M7</description>
<accept condition="CM7_ARMCC"/>
<accept condition="CM7_ARMCC6"/>
<accept condition="CM7_GCC"/>
<accept condition="CM7_IAR"/>
</condition>
<condition id="FreeRTOS Port Cortex-M7 FPU SP">
<description>Requirements for FreeRTOS port for Cortex-M7 using FPU (SP)</description>
<accept condition="CM7_SP_ARMCC"/>
<accept condition="CM7_SP_ARMCC6"/>
<accept condition="CM7_SP_GCC"/>
<accept condition="CM7_SP_IAR"/>
</condition>
<condition id="FreeRTOS Port Cortex-M7 FPU DP">
<description>Requirements for FreeRTOS port for Cortex-M7 using FPU (DP)</description>
<accept condition="CM7_DP_ARMCC"/>
<accept condition="CM7_DP_ARMCC6"/>
<accept condition="CM7_DP_GCC"/>
<accept condition="CM7_DP_IAR"/>
Expand Down Expand Up @@ -705,7 +652,6 @@
</condition>
<condition id="FreeRTOS Port Cortex-A9 FPU DP">
<description>Requirements for FreeRTOS port for Cortex-A9 using FPU (DP)</description>
<accept condition="CA9_DP_ARMCC"/>
<accept condition="CA9_DP_ARMCC6"/>
<accept condition="CA9_DP_GCC"/>
<accept condition="CA9_DP_IAR"/>
Expand Down Expand Up @@ -896,17 +842,11 @@
<deny Cclass="RTOS" Cbundle="FreeRTOS" Cgroup="Timers"/>
</condition>

<condition id="CMSIS RTOS FreeRTOS">
<description>Components required for CMSIS RTOS API on top of FreeRTOS</description>
<require condition="FreeRTOS Port"/>

<require Cclass="CMSIS" Cgroup="RTOS2" Csub="FreeRTOS"/>
</condition>

<condition id="CMSIS RTOS2 FreeRTOS CortexM">
<description>Components required for CMSIS RTOS2 API on top of FreeRTOS for Cortex-M</description>
<require condition="FreeRTOS Port Cortex-M"/>

<require Cclass="CMSIS" Cgroup="OS Tick"/>
<require Cclass="RTOS" Cbundle="FreeRTOS" Cgroup="Config" Cvariant="CMSIS RTOS2"/>
<require Cclass="RTOS" Cbundle="FreeRTOS" Cgroup="Core"/>
<require Cclass="RTOS" Cbundle="FreeRTOS" Cgroup="Event Groups"/>
Expand All @@ -917,8 +857,8 @@
<description>Components required for CMSIS RTOS2 API on top of FreeRTOS for Cortex-A</description>
<require condition="FreeRTOS Port Cortex-A"/>

<require Cclass="CMSIS" Cgroup="OS Tick"/>
<require Cclass="Device" Cgroup="IRQ Controller"/>
<require Cclass="Device" Cgroup="OS Tick"/>
<require Cclass="RTOS" Cbundle="FreeRTOS" Cgroup="Config" Cvariant="CMSIS RTOS2"/>
<require Cclass="RTOS" Cbundle="FreeRTOS" Cgroup="Core"/>
<require Cclass="RTOS" Cbundle="FreeRTOS" Cgroup="Event Groups"/>
Expand All @@ -928,19 +868,6 @@
</conditions>

<components>
<!-- CMSIS-RTOS FreeRTOS component -->
<component Cclass="CMSIS" Cgroup="RTOS" Csub="FreeRTOS" Cversion="11.0.1" Capiversion="1.0.0" condition="CMSIS RTOS FreeRTOS">
<description>CMSIS-RTOS implementation for Cortex-M based on FreeRTOS</description>
<RTE_Components_h>
#define RTE_CMSIS_RTOS /* CMSIS-RTOS */
#define RTE_CMSIS_RTOS_FreeRTOS /* CMSIS-RTOS FreeRTOS */
</RTE_Components_h>
<files>
<file category="header" name="CMSIS/RTOS2/FreeRTOS/Include1/cmsis_os.h"/>
<file category="source" name="CMSIS/RTOS2/FreeRTOS/Source/cmsis_os1.c"/>
</files>
</component>

<!-- CMSIS-RTOS2 FreeRTOS component -->
<component Cclass="CMSIS" Cgroup="RTOS2" Csub="FreeRTOS" Cvariant="Cortex-M" Cversion="11.0.1" Capiversion="2.2.0" condition="CMSIS RTOS2 FreeRTOS CortexM">
<description>CMSIS-RTOS2 implementation for Cortex-M based on FreeRTOS</description>
Expand All @@ -952,10 +879,7 @@
<file category="doc" name="Documentation/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/ARM/clib_arm.c" condition="ARMCC"/>
<file category="source" name="CMSIS/RTOS2/FreeRTOS/Source/ARM/clib_arm.c" condition="ARMCC6"/>

<file category="source" name="CMSIS/RTOS2/FreeRTOS/Source/os_systick.c"/>
<file category="source" name="CMSIS/RTOS2/FreeRTOS/Source/clib_os.c"/>
</files>
</component>

Expand All @@ -969,8 +893,7 @@
<file category="doc" name="Documentation/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/ARM/clib_arm.c" condition="ARMCC"/>
<file category="source" name="CMSIS/RTOS2/FreeRTOS/Source/ARM/clib_arm.c" condition="ARMCC6"/>
<file category="source" name="CMSIS/RTOS2/FreeRTOS/Source/clib_os.c"/>

<file category="source" attr="config" name="CMSIS/RTOS2/FreeRTOS/Source/handlers.c" version="9.1.0"/>
</files>
Expand All @@ -997,21 +920,6 @@
<file category="source" name="Source/queue.c"/>
<file category="source" name="Source/tasks.c"/>

<file category="include" condition="CM0_ARMCC" name="Source/portable/RVDS/ARM_CM0/"/>
<file category="source" condition="CM0_ARMCC" name="Source/portable/RVDS/ARM_CM0/port.c"/>
<file category="include" condition="CM3_ARMCC" name="Source/portable/RVDS/ARM_CM3/"/>
<file category="source" condition="CM3_ARMCC" name="Source/portable/RVDS/ARM_CM3/port.c"/>
<file category="include" condition="CM4_ARMCC" name="Source/portable/RVDS/ARM_CM3/"/>
<file category="source" condition="CM4_ARMCC" name="Source/portable/RVDS/ARM_CM3/port.c"/>
<file category="include" condition="CM4_FP_ARMCC" name="Source/portable/RVDS/ARM_CM4F/"/>
<file category="source" condition="CM4_FP_ARMCC" name="Source/portable/RVDS/ARM_CM4F/port.c"/>
<file category="include" condition="CM7_ARMCC" name="Source/portable/RVDS/ARM_CM3/"/>
<file category="source" condition="CM7_ARMCC" name="Source/portable/RVDS/ARM_CM3/port.c"/>
<file category="include" condition="CM7_DP_ARMCC" name="Source/portable/RVDS/ARM_CM7/r0p1/"/>
<file category="source" condition="CM7_DP_ARMCC" name="Source/portable/RVDS/ARM_CM7/r0p1/port.c"/>
<file category="include" condition="CM7_SP_ARMCC" name="Source/portable/RVDS/ARM_CM7/r0p1/"/>
<file category="source" condition="CM7_SP_ARMCC" name="Source/portable/RVDS/ARM_CM7/r0p1/port.c"/>

<file category="include" condition="CM0_ARMCC6" name="Source/portable/GCC/ARM_CM0/"/>
<file category="source" condition="CM0_ARMCC6" name="Source/portable/GCC/ARM_CM0/port.c"/>
<file category="include" condition="CM3_ARMCC6" name="Source/portable/GCC/ARM_CM3/"/>
Expand Down Expand Up @@ -1135,10 +1043,6 @@
<file category="source" name="Source/portable/Common/mpu_wrappers.c"/>
<file category="source" name="Source/portable/Common/mpu_wrappers_v2.c"/>

<file category="include" condition="CM4_FP_ARMCC" name="Source/portable/RVDS/ARM_CM4_MPU/"/>
<file category="source" condition="CM4_FP_ARMCC" name="Source/portable/RVDS/ARM_CM4_MPU/port.c"/>
<file category="source" condition="CM4_FP_ARMCC" name="Source/portable/RVDS/ARM_CM4_MPU/mpu_wrappers_v2_asm.c"/>

<file category="include" condition="CM3_ARMCC6" name="Source/portable/GCC/ARM_CM3_MPU/"/>
<file category="source" condition="CM3_ARMCC6" name="Source/portable/GCC/ARM_CM3_MPU/port.c"/>
<file category="source" condition="CM3_ARMCC6" name="Source/portable/GCC/ARM_CM3_MPU/mpu_wrappers_v2_asm.c"/>
Expand Down Expand Up @@ -1379,10 +1283,6 @@
<file category="source" name="Source/queue.c"/>
<file category="source" name="Source/tasks.c"/>

<file category="include" condition="ARMCC" name="Source/portable/RVDS/ARM_CA9/"/>
<file category="source" condition="ARMCC" name="Source/portable/RVDS/ARM_CA9/port.c"/>
<file category="sourceAsm" condition="ARMCC" name="Source/portable/RVDS/ARM_CA9/portASM.s"/>

<file category="include" condition="ARMCC6" name="Source/portable/GCC/ARM_CA9/"/>
<file category="source" condition="ARMCC6" name="Source/portable/GCC/ARM_CA9/port.c"/>
<file category="sourceAsm" condition="ARMCC6" name="Source/portable/GCC/ARM_CA9/portASM.S"/>
Expand Down
Loading
Loading