Skip to content

Commit bcc8e35

Browse files
committed
Update FreeRTOS configuration
- Merge Cortex-M and Cortex-A configuration options - Provide FreeRTOS-kernel supplied configuration template with RTOS::Config&FreeRTOS component variant
1 parent 9cdbe17 commit bcc8e35

13 files changed

Lines changed: 590 additions & 909 deletions

File tree

ARM.CMSIS-FreeRTOS.pdsc

Lines changed: 4 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
FreeRTOS 11.0.1
1313
Active development...
1414
- Add support for processor affinity to CMSIS-RTOS2 wrapper
15+
- Add symmetric multiprocessing configuration options to FreeRTOSConfig.h
1516
- Add memory allocation configuration options to FreeRTOSConfig.h
1617
- Corrected task priority mapping, FreeRTOS priority is now osPriority_t-1
1718
- CMSIS-RTOS2 requires CMSIS:OS Tick component
@@ -67,12 +68,6 @@
6768
<require Dcore="Cortex-M7" Dfpu="NO_FPU"/>
6869
</condition>
6970

70-
<condition id="CM7_FP">
71-
<description>Cortex-M7 processor based device using Floating Point Unit</description>
72-
<accept Dcore="Cortex-M7" Dfpu="SP_FPU"/>
73-
<accept Dcore="Cortex-M7" Dfpu="DP_FPU"/>
74-
</condition>
75-
7671
<condition id="CM7_SP">
7772
<description>Cortex-M7 processor based device using Floating Point Unit (SP)</description>
7873
<require Dcore="Cortex-M7" Dfpu="SP_FPU"/>
@@ -161,25 +156,6 @@
161156
<require Dcore="Cortex-A9" Dfpu="DP_FPU"/>
162157
</condition>
163158

164-
<condition id="CoreM">
165-
<description>Cortex-M processor based device</description>
166-
<accept condition="CM0"/>
167-
<accept condition="CM3"/>
168-
<accept condition="CM4"/>
169-
<accept condition="CM4_FP"/>
170-
<accept condition="CM7"/>
171-
<accept condition="CM7_FP"/>
172-
<accept condition="CM23"/>
173-
<accept condition="CM33"/>
174-
<accept condition="CM55"/>
175-
<accept condition="CM85"/>
176-
</condition>
177-
178-
<condition id="CoreA">
179-
<description>Cortex-A processor based device</description>
180-
<accept condition="CA9_DP"/>
181-
</condition>
182-
183159
<!-- ARMCC6 compiler -->
184160
<condition id="CM0_ARMCC6">
185161
<description>Cortex-M0 or Cortex-M0+ or SC000 processor based device for the ARM Compiler 6</description>
@@ -1311,8 +1287,7 @@
13111287
</RTE_Components_h>
13121288
<files>
13131289
<file category="doc" name="Documentation/html/cre_freertos_proj.html#cmsis_freertos_config"/>
1314-
<file category="header" attr="config" name="CMSIS/RTOS2/FreeRTOS/Config/ARMCM/FreeRTOSConfig.h" version="10.6.0" condition="CoreM"/>
1315-
<file category="header" attr="config" name="CMSIS/RTOS2/FreeRTOS/Config/ARMCA/FreeRTOSConfig.h" version="10.4.0" condition="CoreA"/>
1290+
<file category="header" attr="config" name="CMSIS/RTOS2/FreeRTOS/Config/FreeRTOSConfig.h" version="10.6.0"/>
13161291
</files>
13171292
</component>
13181293

@@ -1323,8 +1298,7 @@
13231298
</RTE_Components_h>
13241299
<files>
13251300
<file category="doc" name="Documentation/html/cre_freertos_proj.html#native_freertos_config"/>
1326-
<file category="header" attr="config" name="Config/ARMCM/FreeRTOSConfig.h" version="10.4.0" condition="CoreM"/>
1327-
<file category="header" attr="config" name="Config/ARMCA/FreeRTOSConfig.h" version="10.3.0" condition="CoreA"/>
1301+
<file category="header" attr="config" name="Source/examples/template_configuration/FreeRTOSConfig.h" version="11.0.0"/>
13281302
</files>
13291303
</component>
13301304

@@ -1444,7 +1418,7 @@
14441418
#define RTE_RTOS_FreeRTOS_TZ
14451419
</RTE_Components_h>
14461420
<files>
1447-
<file category="header" attr="config" name="CMSIS/RTOS2/FreeRTOS/Config/ARMCM_TZ/FreeRTOSConfig.h" version="10.2.0"/>
1421+
<file category="header" attr="config" name="CMSIS/RTOS2/FreeRTOS/Config/TrustZone/FreeRTOSConfig.h" version="10.2.0"/>
14481422

14491423
<file category="header" condition="CM23_TZ_ARMCC6" name="Source/portable/GCC/ARM_CM23/secure/secure_port_macros.h"/>
14501424
<file category="include" condition="CM23_TZ_ARMCC6" name="Source/portable/GCC/ARM_CM23/secure/"/>

CMSIS/RTOS2/FreeRTOS/Config/ARMCA/FreeRTOSConfig.h

Lines changed: 0 additions & 199 deletions
This file was deleted.

0 commit comments

Comments
 (0)