diff --git a/CMSIS/CoreValidation/Layer/Target/CA5/Target.clayer.yml b/CMSIS/CoreValidation/Layer/Target/CA5/Target.clayer.yml index e98fcd23d..d4b81fcef 100644 --- a/CMSIS/CoreValidation/Layer/Target/CA5/Target.clayer.yml +++ b/CMSIS/CoreValidation/Layer/Target/CA5/Target.clayer.yml @@ -2,11 +2,6 @@ layer: type: Target description: CA5 target components and files - packs: - - pack: ARM::Cortex_DFP - - device: ARMCA5 - components: # [Cvendor::] Cclass [&Cbundle] :Cgroup [:Csub] [&Cvariant] [@[>=]Cversion] - component: ARM::CMSIS:CORE diff --git a/CMSIS/CoreValidation/Layer/Target/CA7/Target.clayer.yml b/CMSIS/CoreValidation/Layer/Target/CA7/Target.clayer.yml index 51aac29e8..ed0ab2818 100644 --- a/CMSIS/CoreValidation/Layer/Target/CA7/Target.clayer.yml +++ b/CMSIS/CoreValidation/Layer/Target/CA7/Target.clayer.yml @@ -2,11 +2,6 @@ layer: type: Target description: CA7 target components and files - packs: - - pack: ARM::Cortex_DFP - - device: ARMCA7 - components: # [Cvendor::] Cclass [&Cbundle] :Cgroup [:Csub] [&Cvariant] [@[>=]Cversion] - component: ARM::CMSIS:CORE diff --git a/CMSIS/CoreValidation/Layer/Target/CA9/Target.clayer.yml b/CMSIS/CoreValidation/Layer/Target/CA9/Target.clayer.yml index 96dd45da0..7a3fbecd5 100644 --- a/CMSIS/CoreValidation/Layer/Target/CA9/Target.clayer.yml +++ b/CMSIS/CoreValidation/Layer/Target/CA9/Target.clayer.yml @@ -2,11 +2,6 @@ layer: type: Target description: CA9 target components and files - packs: - - pack: ARM::Cortex_DFP - - device: ARMCA9 - components: # [Cvendor::] Cclass [&Cbundle] :Cgroup [:Csub] [&Cvariant] [@[>=]Cversion] - component: ARM::CMSIS:CORE diff --git a/CMSIS/CoreValidation/Layer/Target/CM0/Target.clayer.yml b/CMSIS/CoreValidation/Layer/Target/CM0/Target.clayer.yml index 023f9dbec..8f926e457 100644 --- a/CMSIS/CoreValidation/Layer/Target/CM0/Target.clayer.yml +++ b/CMSIS/CoreValidation/Layer/Target/CM0/Target.clayer.yml @@ -2,11 +2,6 @@ layer: type: Target description: CM0 target components and files - packs: - - pack: ARM::Cortex_DFP - - device: ARMCM0 - components: # [Cvendor::] Cclass [&Cbundle] :Cgroup [:Csub] [&Cvariant] [@[>=]Cversion] - component: ARM::CMSIS:CORE diff --git a/CMSIS/CoreValidation/Layer/Target/CM0plus/Target.clayer.yml b/CMSIS/CoreValidation/Layer/Target/CM0plus/Target.clayer.yml index 6c7be1fa6..8f7da0e94 100644 --- a/CMSIS/CoreValidation/Layer/Target/CM0plus/Target.clayer.yml +++ b/CMSIS/CoreValidation/Layer/Target/CM0plus/Target.clayer.yml @@ -2,11 +2,6 @@ layer: type: Target description: CM0+ target components and files - packs: - - pack: ARM::Cortex_DFP - - device: ARMCM0P - components: # [Cvendor::] Cclass [&Cbundle] :Cgroup [:Csub] [&Cvariant] [@[>=]Cversion] - component: ARM::CMSIS:CORE diff --git a/CMSIS/CoreValidation/Layer/Target/CM23/Target.clayer.yml b/CMSIS/CoreValidation/Layer/Target/CM23/Target.clayer.yml index 0c7732b53..e4234de17 100644 --- a/CMSIS/CoreValidation/Layer/Target/CM23/Target.clayer.yml +++ b/CMSIS/CoreValidation/Layer/Target/CM23/Target.clayer.yml @@ -2,11 +2,6 @@ layer: type: Target description: CM23 target components and files - packs: - - pack: ARM::Cortex_DFP - - device: ARMCM23 - processor: trustzone: off diff --git a/CMSIS/CoreValidation/Layer/Target/CM23NS/Target.clayer.yml b/CMSIS/CoreValidation/Layer/Target/CM23NS/Target.clayer.yml index 2d29e23d7..a32cda2cd 100644 --- a/CMSIS/CoreValidation/Layer/Target/CM23NS/Target.clayer.yml +++ b/CMSIS/CoreValidation/Layer/Target/CM23NS/Target.clayer.yml @@ -2,11 +2,6 @@ layer: type: Target description: CM23NS target components and files - packs: - - pack: ARM::Cortex_DFP - - device: ARMCM23 - processor: trustzone: non-secure diff --git a/CMSIS/CoreValidation/Layer/Target/CM23S/Target.clayer.yml b/CMSIS/CoreValidation/Layer/Target/CM23S/Target.clayer.yml index 1d9112eed..0d54b497f 100644 --- a/CMSIS/CoreValidation/Layer/Target/CM23S/Target.clayer.yml +++ b/CMSIS/CoreValidation/Layer/Target/CM23S/Target.clayer.yml @@ -2,11 +2,6 @@ layer: type: Target description: CM23S target components and files - packs: - - pack: ARM::Cortex_DFP - - device: ARMCM23 - processor: trustzone: secure diff --git a/CMSIS/CoreValidation/Layer/Target/CM3/Target.clayer.yml b/CMSIS/CoreValidation/Layer/Target/CM3/Target.clayer.yml index 9ecd67856..2d95c5dd8 100644 --- a/CMSIS/CoreValidation/Layer/Target/CM3/Target.clayer.yml +++ b/CMSIS/CoreValidation/Layer/Target/CM3/Target.clayer.yml @@ -2,11 +2,6 @@ layer: type: Target description: CM3 target components and files - packs: - - pack: ARM::Cortex_DFP - - device: ARMCM3 - components: # [Cvendor::] Cclass [&Cbundle] :Cgroup [:Csub] [&Cvariant] [@[>=]Cversion] - component: ARM::CMSIS:CORE diff --git a/CMSIS/CoreValidation/Layer/Target/CM33/Target.clayer.yml b/CMSIS/CoreValidation/Layer/Target/CM33/Target.clayer.yml index 014977e40..f5c93b813 100644 --- a/CMSIS/CoreValidation/Layer/Target/CM33/Target.clayer.yml +++ b/CMSIS/CoreValidation/Layer/Target/CM33/Target.clayer.yml @@ -2,11 +2,6 @@ layer: type: Target description: CM33 target components and files - packs: - - pack: ARM::Cortex_DFP - - device: ARMCM33 - processor: trustzone: off diff --git a/CMSIS/CoreValidation/Layer/Target/CM33NS/Target.clayer.yml b/CMSIS/CoreValidation/Layer/Target/CM33NS/Target.clayer.yml index becfefe60..51693352e 100644 --- a/CMSIS/CoreValidation/Layer/Target/CM33NS/Target.clayer.yml +++ b/CMSIS/CoreValidation/Layer/Target/CM33NS/Target.clayer.yml @@ -2,11 +2,6 @@ layer: type: Target description: CM33NS target components and files - packs: - - pack: ARM::Cortex_DFP - - device: ARMCM33 - processor: trustzone: non-secure diff --git a/CMSIS/CoreValidation/Layer/Target/CM33S/Target.clayer.yml b/CMSIS/CoreValidation/Layer/Target/CM33S/Target.clayer.yml index d8d0fd545..a513f15aa 100644 --- a/CMSIS/CoreValidation/Layer/Target/CM33S/Target.clayer.yml +++ b/CMSIS/CoreValidation/Layer/Target/CM33S/Target.clayer.yml @@ -2,11 +2,6 @@ layer: type: Target description: CM33S target components and files - packs: - - pack: ARM::Cortex_DFP - - device: ARMCM33 - processor: trustzone: secure diff --git a/CMSIS/CoreValidation/Layer/Target/CM35P/Target.clayer.yml b/CMSIS/CoreValidation/Layer/Target/CM35P/Target.clayer.yml index 96a998a9a..ce0539b98 100644 --- a/CMSIS/CoreValidation/Layer/Target/CM35P/Target.clayer.yml +++ b/CMSIS/CoreValidation/Layer/Target/CM35P/Target.clayer.yml @@ -2,11 +2,6 @@ layer: type: Target description: CM35P target components and files - packs: - - pack: ARM::Cortex_DFP - - device: ARMCM35P - processor: trustzone: off diff --git a/CMSIS/CoreValidation/Layer/Target/CM35PNS/Target.clayer.yml b/CMSIS/CoreValidation/Layer/Target/CM35PNS/Target.clayer.yml index 337e2a79a..027c0de3c 100644 --- a/CMSIS/CoreValidation/Layer/Target/CM35PNS/Target.clayer.yml +++ b/CMSIS/CoreValidation/Layer/Target/CM35PNS/Target.clayer.yml @@ -2,11 +2,6 @@ layer: type: Target description: CM35PNS target components and files - packs: - - pack: ARM::Cortex_DFP - - device: ARMCM35P - processor: trustzone: non-secure diff --git a/CMSIS/CoreValidation/Layer/Target/CM35PS/Target.clayer.yml b/CMSIS/CoreValidation/Layer/Target/CM35PS/Target.clayer.yml index 393736f33..95be62a8b 100644 --- a/CMSIS/CoreValidation/Layer/Target/CM35PS/Target.clayer.yml +++ b/CMSIS/CoreValidation/Layer/Target/CM35PS/Target.clayer.yml @@ -2,11 +2,6 @@ layer: type: Target description: CM35PS target components and files - packs: - - pack: ARM::Cortex_DFP - - device: ARMCM35P - processor: trustzone: secure diff --git a/CMSIS/CoreValidation/Layer/Target/CM4/Target.clayer.yml b/CMSIS/CoreValidation/Layer/Target/CM4/Target.clayer.yml index 9c5cb64b3..def139200 100644 --- a/CMSIS/CoreValidation/Layer/Target/CM4/Target.clayer.yml +++ b/CMSIS/CoreValidation/Layer/Target/CM4/Target.clayer.yml @@ -2,11 +2,6 @@ layer: type: Target description: CM4 target components and files - packs: - - pack: ARM::Cortex_DFP - - device: ARMCM4 - components: # [Cvendor::] Cclass [&Cbundle] :Cgroup [:Csub] [&Cvariant] [@[>=]Cversion] - component: ARM::CMSIS:CORE diff --git a/CMSIS/CoreValidation/Layer/Target/CM52/Target.clayer.yml b/CMSIS/CoreValidation/Layer/Target/CM52/Target.clayer.yml index f47dd1c29..b7b8cb1c1 100644 --- a/CMSIS/CoreValidation/Layer/Target/CM52/Target.clayer.yml +++ b/CMSIS/CoreValidation/Layer/Target/CM52/Target.clayer.yml @@ -2,11 +2,6 @@ layer: type: Target description: CM52 target components and files - packs: - - pack: ARM::Cortex_DFP - - device: ARMCM52 - processor: trustzone: off diff --git a/CMSIS/CoreValidation/Layer/Target/CM52NS/Target.clayer.yml b/CMSIS/CoreValidation/Layer/Target/CM52NS/Target.clayer.yml index 9548e450f..df9e2cb6b 100644 --- a/CMSIS/CoreValidation/Layer/Target/CM52NS/Target.clayer.yml +++ b/CMSIS/CoreValidation/Layer/Target/CM52NS/Target.clayer.yml @@ -2,11 +2,6 @@ layer: type: Target description: CM52NS target components and files - packs: - - pack: ARM::Cortex_DFP - - device: ARMCM52 - processor: trustzone: non-secure diff --git a/CMSIS/CoreValidation/Layer/Target/CM52S/Target.clayer.yml b/CMSIS/CoreValidation/Layer/Target/CM52S/Target.clayer.yml index 3874ba78c..4e615e2a6 100644 --- a/CMSIS/CoreValidation/Layer/Target/CM52S/Target.clayer.yml +++ b/CMSIS/CoreValidation/Layer/Target/CM52S/Target.clayer.yml @@ -2,11 +2,6 @@ layer: type: Target description: CM52S target components and files - packs: - - pack: ARM::Cortex_DFP - - device: ARMCM52 - processor: trustzone: secure diff --git a/CMSIS/CoreValidation/Layer/Target/CM55/Target.clayer.yml b/CMSIS/CoreValidation/Layer/Target/CM55/Target.clayer.yml index 2ceaa0060..cdecc28a4 100644 --- a/CMSIS/CoreValidation/Layer/Target/CM55/Target.clayer.yml +++ b/CMSIS/CoreValidation/Layer/Target/CM55/Target.clayer.yml @@ -2,11 +2,6 @@ layer: type: Target description: CM55 target components and files - packs: - - pack: ARM::Cortex_DFP - - device: ARMCM55 - processor: trustzone: off diff --git a/CMSIS/CoreValidation/Layer/Target/CM55NS/Target.clayer.yml b/CMSIS/CoreValidation/Layer/Target/CM55NS/Target.clayer.yml index b103a9af8..1783b6063 100644 --- a/CMSIS/CoreValidation/Layer/Target/CM55NS/Target.clayer.yml +++ b/CMSIS/CoreValidation/Layer/Target/CM55NS/Target.clayer.yml @@ -2,11 +2,6 @@ layer: type: Target description: CM55NS target components and files - packs: - - pack: ARM::Cortex_DFP - - device: ARMCM55 - processor: trustzone: non-secure diff --git a/CMSIS/CoreValidation/Layer/Target/CM55S/Target.clayer.yml b/CMSIS/CoreValidation/Layer/Target/CM55S/Target.clayer.yml index dbb852c90..04f3af63f 100644 --- a/CMSIS/CoreValidation/Layer/Target/CM55S/Target.clayer.yml +++ b/CMSIS/CoreValidation/Layer/Target/CM55S/Target.clayer.yml @@ -2,11 +2,6 @@ layer: type: Target description: CM55S target components and files - packs: - - pack: ARM::Cortex_DFP - - device: ARMCM55 - processor: trustzone: secure diff --git a/CMSIS/CoreValidation/Layer/Target/CM7/Target.clayer.yml b/CMSIS/CoreValidation/Layer/Target/CM7/Target.clayer.yml index 19d769150..61c3a5aac 100644 --- a/CMSIS/CoreValidation/Layer/Target/CM7/Target.clayer.yml +++ b/CMSIS/CoreValidation/Layer/Target/CM7/Target.clayer.yml @@ -2,11 +2,6 @@ layer: type: Target description: CM7 target components and files - packs: - - pack: ARM::Cortex_DFP - - device: ARMCM7 - components: # [Cvendor::] Cclass [&Cbundle] :Cgroup [:Csub] [&Cvariant] [@[>=]Cversion] - component: ARM::CMSIS:CORE diff --git a/CMSIS/CoreValidation/Layer/Target/CM85/Target.clayer.yml b/CMSIS/CoreValidation/Layer/Target/CM85/Target.clayer.yml index 9faf89ee8..8c8a0fd3d 100644 --- a/CMSIS/CoreValidation/Layer/Target/CM85/Target.clayer.yml +++ b/CMSIS/CoreValidation/Layer/Target/CM85/Target.clayer.yml @@ -2,11 +2,6 @@ layer: type: Target description: CM85 target components and files - packs: - - pack: ARM::Cortex_DFP - - device: ARMCM85 - processor: trustzone: off diff --git a/CMSIS/CoreValidation/Layer/Target/CM85NS/Target.clayer.yml b/CMSIS/CoreValidation/Layer/Target/CM85NS/Target.clayer.yml index acc4ffe15..e7e0c9bff 100644 --- a/CMSIS/CoreValidation/Layer/Target/CM85NS/Target.clayer.yml +++ b/CMSIS/CoreValidation/Layer/Target/CM85NS/Target.clayer.yml @@ -2,11 +2,6 @@ layer: type: Target description: CM85NS target components and files - packs: - - pack: ARM::Cortex_DFP - - device: ARMCM85 - processor: trustzone: non-secure diff --git a/CMSIS/CoreValidation/Layer/Target/CM85S/Target.clayer.yml b/CMSIS/CoreValidation/Layer/Target/CM85S/Target.clayer.yml index 3640a5df3..2a3cc890d 100644 --- a/CMSIS/CoreValidation/Layer/Target/CM85S/Target.clayer.yml +++ b/CMSIS/CoreValidation/Layer/Target/CM85S/Target.clayer.yml @@ -2,11 +2,6 @@ layer: type: Target description: CM85S target components and files - packs: - - pack: ARM::Cortex_DFP - - device: ARMCM85 - processor: trustzone: secure diff --git a/CMSIS/CoreValidation/Project/Validation.csolution.yml b/CMSIS/CoreValidation/Project/Validation.csolution.yml index 303307c6e..3044ef730 100644 --- a/CMSIS/CoreValidation/Project/Validation.csolution.yml +++ b/CMSIS/CoreValidation/Project/Validation.csolution.yml @@ -1,5 +1,5 @@ solution: - created-for: cmsis-toobox@2.1.0 + created-for: cmsis-toolbox@2.5.0 cdefault: @@ -8,89 +8,125 @@ solution: C-CPP: - -masm-syntax-unified - -Wall + Link: + - --specs=rdimon.specs + - for-compiler: CLANG + Link: + - -lcrt0-semihost + - -lsemihost + - for-compiler: IAR + Link: + - --semihosting packs: - pack: ARM::CMSIS path: ../../../ + - pack: ARM::Cortex_DFP target-types: #Target: CM0 - type: CM0 + device: ARMCM0 #Target: CM0plus - type: CM0plus + device: ARMCM0P #Target: CM3 - type: CM3 + device: ARMCM3 #Target: CM4 - type: CM4 + device: ARMCM4 #Target: CM7 - type: CM7 + device: ARMCM7 #Target: CM23 - type: CM23 + device: ARMCM23 #Target: CM23S - type: CM23S + device: ARMCM23 #Target: CM23NS - type: CM23NS + device: ARMCM23 #Target: CM33 - type: CM33 + device: ARMCM33 #Target: CM33S - type: CM33S + device: ARMCM33 #Target: CM33NS - type: CM33NS + device: ARMCM33 #Target: CM35P - type: CM35P + device: ARMCM35P #Target: CM35PS - type: CM35PS + device: ARMCM35P #Target: CM35PNS - type: CM35PNS + device: ARMCM35P #Target: CM52 - type: CM52 + device: ARMCM52 #Target: CM52S - type: CM52S + device: ARMCM52 #Target: CM52NS - type: CM52NS + device: ARMCM52 #Target: CM55 - type: CM55 + device: ARMCM55 #Target: CM55S - type: CM55S + device: ARMCM55 #Target: CM55NS - type: CM55NS + device: ARMCM55 #Target: CM85 - type: CM85 + device: ARMCM85 #Target: CM85S - type: CM85S + device: ARMCM85 #Target: CM85NS - type: CM85NS + device: ARMCM85 #Target: CA5 - type: CA5 + device: ARMCA5 #Target: CA7 - type: CA7 + device: ARMCA7 #Target: CA9 - type: CA9 + device: ARMCA9 build-types: - type: none @@ -122,5 +158,4 @@ solution: output-dirs: cprjdir: ./build/$TargetType$/$Compiler$/$BuildType$/$Project$ - intdir: ./build/$TargetType$/$Compiler$/$BuildType$/$Project$/intdir outdir: ./build/$TargetType$/$Compiler$/$BuildType$/$Project$/outdir diff --git a/CMSIS/CoreValidation/Project/vcpkg-configuration.json b/CMSIS/CoreValidation/Project/vcpkg-configuration.json index 8761aad3d..1d6b2bb85 100644 --- a/CMSIS/CoreValidation/Project/vcpkg-configuration.json +++ b/CMSIS/CoreValidation/Project/vcpkg-configuration.json @@ -12,7 +12,7 @@ "arm:compilers/arm/armclang":"^6.22.0", "arm:compilers/arm/arm-none-eabi-gcc": "^13.2.1", "arm:compilers/arm/llvm-embedded": "^18.1.3", - "arm:tools/open-cmsis-pack/cmsis-toolbox": "^2.1.0-0", + "arm:tools/open-cmsis-pack/cmsis-toolbox": "^2.5.0-0", "arm:models/arm/avh-fvp": "11.22.39", "arm:debuggers/arm/armdbg": "^6.0.0" }