Core: update CoreValidation to CMSIS toolbox V2.0.0-dev2

grasci-arm · Martin Günther · web-flow · commit a75f01746df1 · 2023-06-21T14:52:04.000+02:00
Co-authored-by: Martin Günther &lt;martin.guenther@arm.com&gt;
diff --git a/CMSIS/CoreValidation/Layer/App/Validation_Cortex-A/App.clayer.yml b/CMSIS/CoreValidation/Layer/App/Validation_Cortex-A/App.clayer.yml
@@ -8,20 +8,20 @@ layer:
   # packs:
   #   - pack: ARM::CMSIS
 
-  defines:
-    - PRINT_XML_REPORT=1
+  define:
+    - PRINT_XML_REPORT: 1
 
-  add-paths:
+  add-path:
     - ../../../Include
     - ../../../Source/ConfigA
 
   misc:
-    - compiler: AC6
-      C*:
+    - for-compiler: AC6
+      C-CPP:
       - -Wno-declaration-after-statement
       - -Wno-covered-switch-default
-    - compiler: GCC
-      C*:
+    - for-compiler: GCC
+      C-CPP:
       - -Wno-declaration-after-statement
       - -Wno-covered-switch-default
 
diff --git a/CMSIS/CoreValidation/Layer/App/Validation_Cortex-M/App.clayer.yml b/CMSIS/CoreValidation/Layer/App/Validation_Cortex-M/App.clayer.yml
@@ -8,20 +8,20 @@ layer:
   # packs:
   #   - pack: ARM::CMSIS
 
-  defines:
-    - PRINT_XML_REPORT=1
+  define:
+    - PRINT_XML_REPORT: 1
 
-  add-paths:
+  add-path:
     - ../../../Include
     - ../../../Source/Config
 
   misc:
-    - compiler: AC6
-      C*:
+    - for-compiler: AC6
+      C-CPP:
       - -Wno-declaration-after-statement
       - -Wno-covered-switch-default
-    - compiler: GCC
-      C*:
+    - for-compiler: GCC
+      C-CPP:
       - -Wno-declaration-after-statement
       - -Wno-covered-switch-default
 
@@ -42,7 +42,7 @@ layer:
         - file: ../../../Source/CV_CoreSimd.c
         - file: ../../../Source/CV_CML1Cache.c
         - file: ../../../Source/CV_MPU_ARMv7.c
-          for-type:
+          for-context:
             - +CM0
             - +CM0plus
             - +CM3
@@ -52,7 +52,7 @@ layer:
             - +CM7SP
             - +CM7DP
         - file: ../../../Source/CV_MPU_ARMv8.c
-          for-type:
+          for-context:
             - +CM23
             - +CM23S
             - +CM23NS
diff --git a/CMSIS/CoreValidation/Layer/Target/CA5/Target.clayer.yml b/CMSIS/CoreValidation/Layer/Target/CA5/Target.clayer.yml
@@ -14,7 +14,7 @@ layer:
     - component: Device:IRQ Controller:GIC
 
   misc:
-    - compiler: IAR
+    - for-compiler: IAR
       Link: [--config generic_cortex.icf]
 
   groups:
diff --git a/CMSIS/CoreValidation/Layer/Target/CA7/Target.clayer.yml b/CMSIS/CoreValidation/Layer/Target/CA7/Target.clayer.yml
@@ -14,7 +14,7 @@ layer:
     - component: Device:IRQ Controller:GIC
 
   misc:
-    - compiler: IAR
+    - for-compiler: IAR
       Link: [--config generic_cortex.icf]
 
   groups:
diff --git a/CMSIS/CoreValidation/Layer/Target/CA9/Target.clayer.yml b/CMSIS/CoreValidation/Layer/Target/CA9/Target.clayer.yml
@@ -14,7 +14,7 @@ layer:
     - component: Device:IRQ Controller:GIC
 
   misc:
-    - compiler: IAR
+    - for-compiler: IAR
       Link: [--config generic_cortex.icf]
 
   groups:
diff --git a/CMSIS/CoreValidation/Layer/Target/CM0/Target.clayer.yml b/CMSIS/CoreValidation/Layer/Target/CM0/Target.clayer.yml
@@ -13,7 +13,7 @@ layer:
     - component: Device:Startup&C Startup
 
   misc:
-    - compiler: IAR
+    - for-compiler: IAR
       Link: [--config generic_cortex.icf]
 
   groups:
diff --git a/CMSIS/CoreValidation/Layer/Target/CM0plus/Target.clayer.yml b/CMSIS/CoreValidation/Layer/Target/CM0plus/Target.clayer.yml
@@ -13,7 +13,7 @@ layer:
     - component: Device:Startup&C Startup
 
   misc:
-    - compiler: IAR
+    - for-compiler: IAR
       Link: [--config generic_cortex.icf]
 
   groups:
diff --git a/CMSIS/CoreValidation/Layer/Target/CM23/Target.clayer.yml b/CMSIS/CoreValidation/Layer/Target/CM23/Target.clayer.yml
@@ -13,7 +13,7 @@ layer:
     - component: Device:Startup&C Startup
 
   misc:
-    - compiler: IAR
+    - for-compiler: IAR
       Link: [--config generic_cortex.icf]
 
   groups:
diff --git a/CMSIS/CoreValidation/Layer/Target/CM23NS/Target.clayer.yml b/CMSIS/CoreValidation/Layer/Target/CM23NS/Target.clayer.yml
@@ -13,7 +13,7 @@ layer:
     - component: Device:Startup&C Startup
 
   misc:
-    - compiler: IAR
+    - for-compiler: IAR
       Link: [--config generic_cortex.icf]
 
   groups:
diff --git a/CMSIS/CoreValidation/Layer/Target/CM23S/Target.clayer.yml b/CMSIS/CoreValidation/Layer/Target/CM23S/Target.clayer.yml
@@ -13,7 +13,7 @@ layer:
     - component: Device:Startup&C Startup
 
   misc:
-    - compiler: IAR
+    - for-compiler: IAR
       Link: [--config generic_cortex.icf]
 
   groups:
diff --git a/CMSIS/CoreValidation/Layer/Target/CM23S_BL/Target.clayer.yml b/CMSIS/CoreValidation/Layer/Target/CM23S_BL/Target.clayer.yml
@@ -13,7 +13,7 @@ layer:
     - component: Device:Startup&C Startup
 
   misc:
-    - compiler: IAR
+    - for-compiler: IAR
       Link: [--config generic_cortex.icf]
 
   groups:
diff --git a/CMSIS/CoreValidation/Layer/Target/CM3/Target.clayer.yml b/CMSIS/CoreValidation/Layer/Target/CM3/Target.clayer.yml
@@ -13,7 +13,7 @@ layer:
     - component: Device:Startup&C Startup
 
   misc:
-    - compiler: IAR
+    - for-compiler: IAR
       Link: [--config generic_cortex.icf]
 
   groups:
diff --git a/CMSIS/CoreValidation/Layer/Target/CM33/Target.clayer.yml b/CMSIS/CoreValidation/Layer/Target/CM33/Target.clayer.yml
@@ -13,7 +13,7 @@ layer:
     - component: Device:Startup&C Startup
 
   misc:
-    - compiler: IAR
+    - for-compiler: IAR
       Link: [--config generic_cortex.icf]
 
   groups:
diff --git a/CMSIS/CoreValidation/Layer/Target/CM33NS/Target.clayer.yml b/CMSIS/CoreValidation/Layer/Target/CM33NS/Target.clayer.yml
@@ -13,7 +13,7 @@ layer:
     - component: Device:Startup&C Startup
 
   misc:
-    - compiler: IAR
+    - for-compiler: IAR
       Link: [--config generic_cortex.icf]
 
   groups:
diff --git a/CMSIS/CoreValidation/Layer/Target/CM33S/Target.clayer.yml b/CMSIS/CoreValidation/Layer/Target/CM33S/Target.clayer.yml
@@ -13,7 +13,7 @@ layer:
     - component: Device:Startup&C Startup
 
   misc:
-    - compiler: IAR
+    - for-compiler: IAR
       Link: [--config generic_cortex.icf]
 
   groups:
diff --git a/CMSIS/CoreValidation/Layer/Target/CM33S_BL/Target.clayer.yml b/CMSIS/CoreValidation/Layer/Target/CM33S_BL/Target.clayer.yml
@@ -13,7 +13,7 @@ layer:
     - component: Device:Startup&C Startup
 
   misc:
-    - compiler: IAR
+    - for-compiler: IAR
       Link: [--config generic_cortex.icf]
 
   groups:
diff --git a/CMSIS/CoreValidation/Layer/Target/CM35P/Target.clayer.yml b/CMSIS/CoreValidation/Layer/Target/CM35P/Target.clayer.yml
@@ -13,7 +13,7 @@ layer:
     - component: Device:Startup&C Startup
 
   misc:
-    - compiler: IAR
+    - for-compiler: IAR
       Link: [--config generic_cortex.icf]
 
   groups:
diff --git a/CMSIS/CoreValidation/Layer/Target/CM35PNS/Target.clayer.yml b/CMSIS/CoreValidation/Layer/Target/CM35PNS/Target.clayer.yml
@@ -13,7 +13,7 @@ layer:
     - component: Device:Startup&C Startup
 
   misc:
-    - compiler: IAR
+    - for-compiler: IAR
       Link: [--config generic_cortex.icf]
 
   groups:
diff --git a/CMSIS/CoreValidation/Layer/Target/CM35PS/Target.clayer.yml b/CMSIS/CoreValidation/Layer/Target/CM35PS/Target.clayer.yml
@@ -13,7 +13,7 @@ layer:
     - component: Device:Startup&C Startup
 
   misc:
-    - compiler: IAR
+    - for-compiler: IAR
       Link: [--config generic_cortex.icf]
 
   groups:
diff --git a/CMSIS/CoreValidation/Layer/Target/CM35PS_BL/Target.clayer.yml b/CMSIS/CoreValidation/Layer/Target/CM35PS_BL/Target.clayer.yml
@@ -13,7 +13,7 @@ layer:
     - component: Device:Startup&C Startup
 
   misc:
-    - compiler: IAR
+    - for-compiler: IAR
       Link: [--config generic_cortex.icf]
 
   groups:
diff --git a/CMSIS/CoreValidation/Layer/Target/CM4/Target.clayer.yml b/CMSIS/CoreValidation/Layer/Target/CM4/Target.clayer.yml
@@ -13,7 +13,7 @@ layer:
     - component: Device:Startup&C Startup
 
   misc:
-    - compiler: IAR
+    - for-compiler: IAR
       Link: [--config generic_cortex.icf]
 
   groups:
diff --git a/CMSIS/CoreValidation/Layer/Target/CM4FP/Target.clayer.yml b/CMSIS/CoreValidation/Layer/Target/CM4FP/Target.clayer.yml
@@ -13,7 +13,7 @@ layer:
     - component: Device:Startup&C Startup
 
   misc:
-    - compiler: IAR
+    - for-compiler: IAR
       Link: [--config generic_cortex.icf]
 
   groups:
diff --git a/CMSIS/CoreValidation/Layer/Target/CM55NS/Target.clayer.yml b/CMSIS/CoreValidation/Layer/Target/CM55NS/Target.clayer.yml
@@ -13,7 +13,7 @@ layer:
     - component: Device:Startup&C Startup
 
   misc:
-    - compiler: IAR
+    - for-compiler: IAR
       Link: [--config generic_cortex.icf]
 
   groups:
diff --git a/CMSIS/CoreValidation/Layer/Target/CM55S/Target.clayer.yml b/CMSIS/CoreValidation/Layer/Target/CM55S/Target.clayer.yml
@@ -13,7 +13,7 @@ layer:
     - component: Device:Startup&C Startup
 
   misc:
-    - compiler: IAR
+    - for-compiler: IAR
       Link: [--config generic_cortex.icf]
 
   groups:
diff --git a/CMSIS/CoreValidation/Layer/Target/CM55S_BL/Target.clayer.yml b/CMSIS/CoreValidation/Layer/Target/CM55S_BL/Target.clayer.yml
@@ -13,7 +13,7 @@ layer:
     - component: Device:Startup&C Startup
 
   misc:
-    - compiler: IAR
+    - for-compiler: IAR
       Link: [--config generic_cortex.icf]
 
   groups:
diff --git a/CMSIS/CoreValidation/Layer/Target/CM7/Target.clayer.yml b/CMSIS/CoreValidation/Layer/Target/CM7/Target.clayer.yml
@@ -13,7 +13,7 @@ layer:
     - component: Device:Startup&C Startup
 
   misc:
-    - compiler: IAR
+    - for-compiler: IAR
       Link: [--config generic_cortex.icf]
 
   groups:
diff --git a/CMSIS/CoreValidation/Layer/Target/CM7DP/Target.clayer.yml b/CMSIS/CoreValidation/Layer/Target/CM7DP/Target.clayer.yml
@@ -13,7 +13,7 @@ layer:
     - component: Device:Startup&C Startup
 
   misc:
-    - compiler: IAR
+    - for-compiler: IAR
       Link: [--config generic_cortex.icf]
 
   groups:
diff --git a/CMSIS/CoreValidation/Layer/Target/CM7SP/Target.clayer.yml b/CMSIS/CoreValidation/Layer/Target/CM7SP/Target.clayer.yml
@@ -13,7 +13,7 @@ layer:
     - component: Device:Startup&C Startup
 
   misc:
-    - compiler: IAR
+    - for-compiler: IAR
       Link: [--config generic_cortex.icf]
 
   groups:
diff --git a/CMSIS/CoreValidation/Layer/Target/CM85NS/Target.clayer.yml b/CMSIS/CoreValidation/Layer/Target/CM85NS/Target.clayer.yml
@@ -13,7 +13,7 @@ layer:
     - component: Device:Startup&C Startup
 
   misc:
-    - compiler: IAR
+    - for-compiler: IAR
       Link: [--config generic_cortex.icf]
 
   groups:
diff --git a/CMSIS/CoreValidation/Layer/Target/CM85S/Target.clayer.yml b/CMSIS/CoreValidation/Layer/Target/CM85S/Target.clayer.yml
@@ -13,7 +13,7 @@ layer:
     - component: Device:Startup&C Startup
 
   misc:
-    - compiler: IAR
+    - for-compiler: IAR
       Link: [--config generic_cortex.icf]
 
   groups:
diff --git a/CMSIS/CoreValidation/Layer/Target/CM85S_BL/Target.clayer.yml b/CMSIS/CoreValidation/Layer/Target/CM85S_BL/Target.clayer.yml
@@ -13,7 +13,7 @@ layer:
     - component: Device:Startup&C Startup
 
   misc:
-    - compiler: IAR
+    - for-compiler: IAR
       Link: [--config generic_cortex.icf]
 
   groups:
diff --git a/CMSIS/CoreValidation/Project/Bootloader.cproject.yml b/CMSIS/CoreValidation/Project/Bootloader.cproject.yml
@@ -4,7 +4,7 @@ project:
   layers:
     # App: CMSIS-Core Validation for Cortex-M (Bootloader part)
     - layer: ../Layer/App/Bootloader_Cortex-M/App.clayer.yml
-      for-type:
+      for-context:
         - .AC6_low
         - .AC6_mid
         - .AC6_high
@@ -23,7 +23,7 @@ project:
 
     #Target: CM23S
     - layer: ../Layer/Target/CM23S_BL/Target.clayer.yml
-      for-type:
+      for-context:
         - .AC6_low+CM23S
         - .AC6_mid+CM23S
         - .AC6_high+CM23S
@@ -42,7 +42,7 @@ project:
 
     #Target: CM33S
     - layer: ../Layer/Target/CM33S_BL/Target.clayer.yml
-      for-type:
+      for-context:
         - .AC6_low+CM33S
         - .AC6_mid+CM33S
         - .AC6_high+CM33S
@@ -61,7 +61,7 @@ project:
 
     #Target: CM35PS
     - layer: ../Layer/Target/CM35PS_BL/Target.clayer.yml
-      for-type:
+      for-context:
         - .AC6_low+CM35PS
         - .AC6_mid+CM35PS
         - .AC6_high+CM35PS
@@ -80,7 +80,7 @@ project:
 
     #Target: CM55S
     - layer: ../Layer/Target/CM55S_BL/Target.clayer.yml
-      for-type:
+      for-context:
         - .AC6_low+CM55S
         - .AC6_mid+CM55S
         - .AC6_high+CM55S
@@ -99,7 +99,7 @@ project:
 
     #Target: CM85S
     - layer: ../Layer/Target/CM85S_BL/Target.clayer.yml
-      for-type:
+      for-context:
         - .AC6_low+CM85S
         - .AC6_mid+CM85S
         - .AC6_high+CM85S
diff --git a/CMSIS/CoreValidation/Project/Validation.cproject.yml b/CMSIS/CoreValidation/Project/Validation.cproject.yml
diff --git a/CMSIS/CoreValidation/Project/Validation.csolution.yml b/CMSIS/CoreValidation/Project/Validation.csolution.yml
diff --git a/CMSIS/CoreValidation/Project/build.py b/CMSIS/CoreValidation/Project/build.py
