From a75f01746df18bb5b929dfb8dc6c9407fac3a0f3 Mon Sep 17 00:00:00 2001 From: grasci <86058054+grasci-arm@users.noreply.github.com> Date: Wed, 21 Jun 2023 13:52:04 +0100 Subject: [PATCH] Core: update CoreValidation to CMSIS toolbox V2.0.0-dev2 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Martin Günther --- .../App/Validation_Cortex-A/App.clayer.yml | 14 ++--- .../App/Validation_Cortex-M/App.clayer.yml | 18 +++---- .../Layer/Target/CA5/Target.clayer.yml | 2 +- .../Layer/Target/CA7/Target.clayer.yml | 2 +- .../Layer/Target/CA9/Target.clayer.yml | 2 +- .../Layer/Target/CM0/Target.clayer.yml | 2 +- .../Layer/Target/CM0plus/Target.clayer.yml | 2 +- .../Layer/Target/CM23/Target.clayer.yml | 2 +- .../Layer/Target/CM23NS/Target.clayer.yml | 2 +- .../Layer/Target/CM23S/Target.clayer.yml | 2 +- .../Layer/Target/CM23S_BL/Target.clayer.yml | 2 +- .../Layer/Target/CM3/Target.clayer.yml | 2 +- .../Layer/Target/CM33/Target.clayer.yml | 2 +- .../Layer/Target/CM33NS/Target.clayer.yml | 2 +- .../Layer/Target/CM33S/Target.clayer.yml | 2 +- .../Layer/Target/CM33S_BL/Target.clayer.yml | 2 +- .../Layer/Target/CM35P/Target.clayer.yml | 2 +- .../Layer/Target/CM35PNS/Target.clayer.yml | 2 +- .../Layer/Target/CM35PS/Target.clayer.yml | 2 +- .../Layer/Target/CM35PS_BL/Target.clayer.yml | 2 +- .../Layer/Target/CM4/Target.clayer.yml | 2 +- .../Layer/Target/CM4FP/Target.clayer.yml | 2 +- .../Layer/Target/CM55NS/Target.clayer.yml | 2 +- .../Layer/Target/CM55S/Target.clayer.yml | 2 +- .../Layer/Target/CM55S_BL/Target.clayer.yml | 2 +- .../Layer/Target/CM7/Target.clayer.yml | 2 +- .../Layer/Target/CM7DP/Target.clayer.yml | 2 +- .../Layer/Target/CM7SP/Target.clayer.yml | 2 +- .../Layer/Target/CM85NS/Target.clayer.yml | 2 +- .../Layer/Target/CM85S/Target.clayer.yml | 2 +- .../Layer/Target/CM85S_BL/Target.clayer.yml | 2 +- .../Project/Bootloader.cproject.yml | 12 ++--- .../Project/Validation.cproject.yml | 52 +++++++++---------- .../Project/Validation.csolution.yml | 38 +++++++------- CMSIS/CoreValidation/Project/build.py | 4 +- 35 files changed, 98 insertions(+), 98 deletions(-) diff --git a/CMSIS/CoreValidation/Layer/App/Validation_Cortex-A/App.clayer.yml b/CMSIS/CoreValidation/Layer/App/Validation_Cortex-A/App.clayer.yml index ff71031145..e8fece94cc 100644 --- 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 index 0b3e903226..e722ac5111 100644 --- 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 index 4620a1a770..354560ac38 100644 --- 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 index 4620a1a770..354560ac38 100644 --- 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 index 4620a1a770..354560ac38 100644 --- 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 index 525d7ed1b0..ee45512d30 100644 --- 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 index 525d7ed1b0..ee45512d30 100644 --- 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 index 525d7ed1b0..ee45512d30 100644 --- 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 index 525d7ed1b0..ee45512d30 100644 --- 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 index 525d7ed1b0..ee45512d30 100644 --- 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 index 525d7ed1b0..ee45512d30 100644 --- 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 index 525d7ed1b0..ee45512d30 100644 --- 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 index 525d7ed1b0..ee45512d30 100644 --- 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 index 525d7ed1b0..ee45512d30 100644 --- 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 index 525d7ed1b0..ee45512d30 100644 --- 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 index 525d7ed1b0..ee45512d30 100644 --- 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 index 525d7ed1b0..ee45512d30 100644 --- 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 index 525d7ed1b0..ee45512d30 100644 --- 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 index 525d7ed1b0..ee45512d30 100644 --- 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 index 525d7ed1b0..ee45512d30 100644 --- 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 index 525d7ed1b0..ee45512d30 100644 --- 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 index 525d7ed1b0..ee45512d30 100644 --- 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 index 525d7ed1b0..ee45512d30 100644 --- 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 index 525d7ed1b0..ee45512d30 100644 --- 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 index 525d7ed1b0..ee45512d30 100644 --- 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 index 525d7ed1b0..ee45512d30 100644 --- 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 index 525d7ed1b0..ee45512d30 100644 --- 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 index 525d7ed1b0..ee45512d30 100644 --- 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 index 525d7ed1b0..ee45512d30 100644 --- 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 index 525d7ed1b0..ee45512d30 100644 --- 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 index 525d7ed1b0..ee45512d30 100644 --- 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 index 45b5ed8b4e..34536945b8 100644 --- 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 index a94c3ffa12..23e5b1a513 100644 --- a/CMSIS/CoreValidation/Project/Validation.cproject.yml +++ b/CMSIS/CoreValidation/Project/Validation.cproject.yml @@ -4,7 +4,7 @@ project: layers: # App: CMSIS-Core Validation for Cortex-M - layer: ../Layer/App/Validation_Cortex-M/App.clayer.yml - for-type: + for-context: - +CM0 - +CM0plus - +CM3 @@ -29,14 +29,14 @@ project: # App: CMSIS-Core Validation for Cortex-A - layer: ../Layer/App/Validation_Cortex-A/App.clayer.yml - for-type: + for-context: - +CA5 - +CA7 - +CA9 #Target: CM0 - layer: ../Layer/Target/CM0/Target.clayer.yml - for-type: + for-context: - .AC6_low+CM0 - .AC6_mid+CM0 - .AC6_high+CM0 @@ -55,7 +55,7 @@ project: #Target: CM0plus - layer: ../Layer/Target/CM0plus/Target.clayer.yml - for-type: + for-context: - .AC6_low+CM0plus - .AC6_mid+CM0plus - .AC6_high+CM0plus @@ -74,7 +74,7 @@ project: #Target: CM3 - layer: ../Layer/Target/CM3/Target.clayer.yml - for-type: + for-context: - .AC6_low+CM3 - .AC6_mid+CM3 - .AC6_high+CM3 @@ -93,7 +93,7 @@ project: #Target: CM4 - layer: ../Layer/Target/CM4/Target.clayer.yml - for-type: + for-context: - .AC6_low+CM4 - .AC6_mid+CM4 - .AC6_high+CM4 @@ -112,7 +112,7 @@ project: #Target: CM4FP - layer: ../Layer/Target/CM4FP/Target.clayer.yml - for-type: + for-context: - .AC6_low+CM4FP - .AC6_mid+CM4FP - .AC6_high+CM4FP @@ -131,7 +131,7 @@ project: #Target: CM7 - layer: ../Layer/Target/CM7/Target.clayer.yml - for-type: + for-context: - .AC6_low+CM7 - .AC6_mid+CM7 - .AC6_high+CM7 @@ -150,7 +150,7 @@ project: #Target: CM7SP - layer: ../Layer/Target/CM7SP/Target.clayer.yml - for-type: + for-context: - .AC6_low+CM7SP - .AC6_mid+CM7SP - .AC6_high+CM7SP @@ -169,7 +169,7 @@ project: #Target: CM7DP - layer: ../Layer/Target/CM7DP/Target.clayer.yml - for-type: + for-context: - .AC6_low+CM7DP - .AC6_mid+CM7DP - .AC6_high+CM7DP @@ -188,7 +188,7 @@ project: #Target: CM23 - layer: ../Layer/Target/CM23/Target.clayer.yml - for-type: + for-context: - .AC6_low+CM23 - .AC6_mid+CM23 - .AC6_high+CM23 @@ -207,7 +207,7 @@ project: #Target: CM23S - layer: ../Layer/Target/CM23S/Target.clayer.yml - for-type: + for-context: - .AC6_low+CM23S - .AC6_mid+CM23S - .AC6_high+CM23S @@ -226,7 +226,7 @@ project: #Target: CM23NS - layer: ../Layer/Target/CM23NS/Target.clayer.yml - for-type: + for-context: - .AC6_low+CM23NS - .AC6_mid+CM23NS - .AC6_high+CM23NS @@ -245,7 +245,7 @@ project: #Target: CM33 - layer: ../Layer/Target/CM33/Target.clayer.yml - for-type: + for-context: - .AC6_low+CM33 - .AC6_mid+CM33 - .AC6_high+CM33 @@ -264,7 +264,7 @@ project: #Target: CM33S - layer: ../Layer/Target/CM33S/Target.clayer.yml - for-type: + for-context: - .AC6_low+CM33S - .AC6_mid+CM33S - .AC6_high+CM33S @@ -283,7 +283,7 @@ project: #Target: CM33NS - layer: ../Layer/Target/CM33NS/Target.clayer.yml - for-type: + for-context: - .AC6_low+CM33NS - .AC6_mid+CM33NS - .AC6_high+CM33NS @@ -302,7 +302,7 @@ project: #Target: CM35P - layer: ../Layer/Target/CM35P/Target.clayer.yml - for-type: + for-context: - .AC6_low+CM35P - .AC6_mid+CM35P - .AC6_high+CM35P @@ -321,7 +321,7 @@ project: #Target: CM35PS - layer: ../Layer/Target/CM35PS/Target.clayer.yml - for-type: + for-context: - .AC6_low+CM35PS - .AC6_mid+CM35PS - .AC6_high+CM35PS @@ -340,7 +340,7 @@ project: #Target: CM35PNS - layer: ../Layer/Target/CM35PNS/Target.clayer.yml - for-type: + for-context: - .AC6_low+CM35PNS - .AC6_mid+CM35PNS - .AC6_high+CM35PNS @@ -359,7 +359,7 @@ project: #Target: CM55S - layer: ../Layer/Target/CM55S/Target.clayer.yml - for-type: + for-context: - .AC6_low+CM55S - .AC6_mid+CM55S - .AC6_high+CM55S @@ -378,7 +378,7 @@ project: #Target: CM55NS - layer: ../Layer/Target/CM55NS/Target.clayer.yml - for-type: + for-context: - .AC6_low+CM55NS - .AC6_mid+CM55NS - .AC6_high+CM55NS @@ -397,7 +397,7 @@ project: #Target: CM85S - layer: ../Layer/Target/CM85S/Target.clayer.yml - for-type: + for-context: - .AC6_low+CM85S - .AC6_mid+CM85S - .AC6_high+CM85S @@ -416,7 +416,7 @@ project: #Target: CM85NS - layer: ../Layer/Target/CM85NS/Target.clayer.yml - for-type: + for-context: - .AC6_low+CM85NS - .AC6_mid+CM85NS - .AC6_high+CM85NS @@ -435,7 +435,7 @@ project: #Target: CA5 - layer: ../Layer/Target/CA5/Target.clayer.yml - for-type: + for-context: - .AC6_low+CA5 - .AC6_mid+CA5 - .AC6_high+CA5 @@ -454,7 +454,7 @@ project: #Target: CA7 - layer: ../Layer/Target/CA7/Target.clayer.yml - for-type: + for-context: - .AC6_low+CA7 - .AC6_mid+CA7 - .AC6_high+CA7 @@ -473,7 +473,7 @@ project: #Target: CA9 - layer: ../Layer/Target/CA9/Target.clayer.yml - for-type: + for-context: - .AC6_low+CA9 - .AC6_mid+CA9 - .AC6_high+CA9 diff --git a/CMSIS/CoreValidation/Project/Validation.csolution.yml b/CMSIS/CoreValidation/Project/Validation.csolution.yml index 633387b604..373eed05a1 100644 --- a/CMSIS/CoreValidation/Project/Validation.csolution.yml +++ b/CMSIS/CoreValidation/Project/Validation.csolution.yml @@ -6,13 +6,13 @@ solution: path: ../../../ misc: - - compiler: AC6 + - for-compiler: AC6 C: [-std=c99, -gdwarf-4, -ffunction-sections] Link: [--entry=Reset_Handler, --symbols, --map] - - compiler: GCC + - for-compiler: GCC C: [-std=gnu99, -gdwarf-2, -ffunction-sections, -fdata-sections] Link: [--specs=nano.specs, --specs=rdimon.specs] - - compiler: IAR + - for-compiler: IAR Link: [--semihosting] target-types: @@ -143,86 +143,86 @@ solution: - type: AC6_low compiler: AC6 misc: - - compiler: AC6 + - for-compiler: AC6 C: [-O1] - type: AC6_mid compiler: AC6 misc: - - compiler: AC6 + - for-compiler: AC6 C: [-O2] - type: AC6_high compiler: AC6 misc: - - compiler: AC6 + - for-compiler: AC6 C: [-O3] - type: AC6_size compiler: AC6 misc: - - compiler: AC6 + - for-compiler: AC6 C: [-Os] - type: AC6_tiny compiler: AC6 misc: - - compiler: AC6 + - for-compiler: AC6 C: [-Oz] #GCC_low, GCC_mid, GCC_high, GCC_size, GCC_OZ, - type: GCC_low compiler: GCC misc: - - compiler: GCC + - for-compiler: GCC C: [-O1] - type: GCC_mid compiler: GCC misc: - - compiler: GCC + - for-compiler: GCC C: [-O2] - type: GCC_high compiler: GCC misc: - - compiler: GCC + - for-compiler: GCC C: [-O3] - type: GCC_size compiler: GCC misc: - - compiler: GCC + - for-compiler: GCC C: [-Os] - type: GCC_tiny compiler: GCC misc: - - compiler: GCC + - for-compiler: GCC C: [-Ofast] #IAR_low - type: IAR_low compiler: IAR misc: - - compiler: IAR + - for-compiler: IAR C: [-Ol, --dlib_config DLib_Config_Full.h] - type: IAR_mid compiler: IAR misc: - - compiler: IAR + - for-compiler: IAR C: [-Om, --dlib_config DLib_Config_Full.h] - type: IAR_high compiler: IAR misc: - - compiler: IAR + - for-compiler: IAR C: [-Oh, --dlib_config DLib_Config_Full.h] - type: IAR_size compiler: IAR misc: - - compiler: IAR + - for-compiler: IAR C: [-Ohz, --dlib_config DLib_Config_Full.h] - type: IAR_tiny compiler: IAR misc: - - compiler: IAR + - for-compiler: IAR C: [-Ohs, --dlib_config DLib_Config_Full.h] projects: - project: ./Validation.cproject.yml - project: ./Bootloader.cproject.yml - for-type: + for-context: - +CM23S - +CM33S - +CM35PS diff --git a/CMSIS/CoreValidation/Project/build.py b/CMSIS/CoreValidation/Project/build.py index f6294dc4e7..3259e4c9fd 100644 --- a/CMSIS/CoreValidation/Project/build.py +++ b/CMSIS/CoreValidation/Project/build.py @@ -131,7 +131,7 @@ def config_suffix(config, timestamp=True): def image_name(config): - return f"{config.compiler}_{config.optimize}+{config.device[1]}" + return f"Validation" def project_name(config): @@ -139,7 +139,7 @@ def project_name(config): def bl_image_name(config): - return f"{config.compiler}_{config.optimize}+{config.device.bl_device}" + return f"Bootloader" def bl_project_name(config):