Update FreeRTOS configuration

- Merge Cortex-M and Cortex-A configuration options
- Provide FreeRTOS-kernel supplied configuration template with RTOS::Config&FreeRTOS component variant

ARM.CMSIS-FreeRTOS.pdsc

@@ -12,6 +12,7 @@
       FreeRTOS 11.0.1
       Active development...
       - Add support for processor affinity to CMSIS-RTOS2 wrapper
+      - Add symmetric multiprocessing configuration options to FreeRTOSConfig.h
       - Add memory allocation configuration options to FreeRTOSConfig.h
       - CMSIS-RTOS2 requires CMSIS:OS Tick component
       - Drop support for Arm Compiler 5
@@ -66,12 +67,6 @@
       <require Dcore="Cortex-M7" Dfpu="NO_FPU"/>
     </condition>
 
-    <condition id="CM7_FP">
-      <description>Cortex-M7 processor based device using Floating Point Unit</description>
-      <accept Dcore="Cortex-M7" Dfpu="SP_FPU"/>
-      <accept Dcore="Cortex-M7" Dfpu="DP_FPU"/>
-    </condition>
-
     <condition id="CM7_SP">
       <description>Cortex-M7 processor based device using Floating Point Unit (SP)</description>
       <require Dcore="Cortex-M7" Dfpu="SP_FPU"/>
@@ -160,25 +155,6 @@
       <require Dcore="Cortex-A9" Dfpu="DP_FPU"/>
     </condition>
 
-    <condition id="CoreM">
-      <description>Cortex-M processor based device</description>
-      <accept condition="CM0"/>
-      <accept condition="CM3"/>
-      <accept condition="CM4"/>
-      <accept condition="CM4_FP"/>
-      <accept condition="CM7"/>
-      <accept condition="CM7_FP"/>
-      <accept condition="CM23"/>
-      <accept condition="CM33"/>
-      <accept condition="CM55"/>
-      <accept condition="CM85"/>
-    </condition>
-
-    <condition id="CoreA">
-      <description>Cortex-A processor based device</description>
-      <accept condition="CA9_DP"/>
-    </condition>
-
     <!-- ARMCC6 compiler -->
     <condition id="CM0_ARMCC6">
       <description>Cortex-M0 or Cortex-M0+ or SC000 processor based device for the ARM Compiler 6</description>
@@ -1310,8 +1286,7 @@
         </RTE_Components_h>
         <files>
           <file category="doc"    name="Documentation/html/cre_freertos_proj.html#cmsis_freertos_config"/>
-          <file category="header" attr="config" name="CMSIS/RTOS2/FreeRTOS/Config/ARMCM/FreeRTOSConfig.h" version="10.6.0" condition="CoreM"/>
-          <file category="header" attr="config" name="CMSIS/RTOS2/FreeRTOS/Config/ARMCA/FreeRTOSConfig.h" version="10.4.0" condition="CoreA"/>
+          <file category="header" attr="config" name="CMSIS/RTOS2/FreeRTOS/Config/FreeRTOSConfig.h" version="10.6.0"/>
         </files>
       </component>
 
@@ -1322,8 +1297,7 @@
         </RTE_Components_h>
         <files>
           <file category="doc"    name="Documentation/html/cre_freertos_proj.html#native_freertos_config"/>
-          <file category="header" attr="config" name="Config/ARMCM/FreeRTOSConfig.h" version="10.4.0" condition="CoreM"/>
-          <file category="header" attr="config" name="Config/ARMCA/FreeRTOSConfig.h" version="10.3.0" condition="CoreA"/>
+          <file category="header" attr="config" name="Source/examples/template_configuration/FreeRTOSConfig.h" version="11.0.0"/>
         </files>
       </component>
 
@@ -1443,7 +1417,7 @@
           #define RTE_RTOS_FreeRTOS_TZ
         </RTE_Components_h>
         <files>
-          <file category="header" attr="config" name="CMSIS/RTOS2/FreeRTOS/Config/ARMCM_TZ/FreeRTOSConfig.h" version="10.2.0"/>
+          <file category="header" attr="config" name="CMSIS/RTOS2/FreeRTOS/Config/TrustZone/FreeRTOSConfig.h" version="10.2.0"/>
 
           <file category="header"    condition="CM23_TZ_ARMCC6"  name="Source/portable/GCC/ARM_CM23/secure/secure_port_macros.h"/>
           <file category="include"   condition="CM23_TZ_ARMCC6"  name="Source/portable/GCC/ARM_CM23/secure/"/>