From 27567fa8e7350f855a3e370e1cefb08611fe47d8 Mon Sep 17 00:00:00 2001 From: Jonatan Antoni Date: Mon, 27 Mar 2023 17:37:01 +0200 Subject: [PATCH] MLECO-4001: Update cmsis-pack-example to use toolbox v1.5.0 Changes: - Enhance .gitignore with new temp files - Moved compiler misc flags into .cdefault.yml - Use optimize attribute instead of misc flags Change-Id: I18251f1657165184d812749dd315ff5651d7de29 Signed-off-by: Kshitij Sisodia --- .gitignore | 4 ++- cmsis-pack-examples/.cdefault.yml | 36 +++++++++++++++++++ cmsis-pack-examples/common/common.clayer.yml | 2 +- .../alif-ensemble-E7-device.clayer.yml | 2 +- .../corstone/corstone-device.clayer.yml | 2 +- .../frdm-k64f/frdm-k64f-device.clayer.yml | 6 +--- .../stm32f746-discovery-device.clayer.yml | 2 +- cmsis-pack-examples/kws/kws.cproject.yml | 2 +- cmsis-pack-examples/mlek.csolution.yml | 28 ++------------- .../object-detection.cproject.yml | 2 +- 10 files changed, 49 insertions(+), 37 deletions(-) create mode 100644 cmsis-pack-examples/.cdefault.yml diff --git a/.gitignore b/.gitignore index 0b75751..1363260 100644 --- a/.gitignore +++ b/.gitignore @@ -113,4 +113,6 @@ packlist.txt *.cprj RTE/ out/ -tmp/ \ No newline at end of file +tmp/ +*.cbuild.yml +*.cbuild-idx.yml diff --git a/cmsis-pack-examples/.cdefault.yml b/cmsis-pack-examples/.cdefault.yml new file mode 100644 index 0000000..8ce2541 --- /dev/null +++ b/cmsis-pack-examples/.cdefault.yml @@ -0,0 +1,36 @@ +# SPDX-FileCopyrightText: Copyright 2023 Arm Limited and/or its +# affiliates +# SPDX-License-Identifier: Apache-2.0 +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +# yaml-language-server: $schema=https://raw.githubusercontent.com/Open-CMSIS-Pack/devtools/schemas/projmgr/1.5.0/tools/projmgr/schemas/cdefault.schema.json + +default: + # Note that we need AC6@6.18 or higher to compile for Corstone-310 target. + compiler: AC6 + + misc: + - for-compiler: AC6 + CPP: + - -std=c++14 -fno-exceptions -Wno-license-management -fno-rtti + C: + - -std=c99 -Wno-license-management + Link: + - --entry=Reset_Handler + - --verbose + - --callgraph_file='callgraph' + - --map + - --info=sizes,totals,unused,compression,inline,summarysizes + - --list='diagnostics.map' + - --diag_suppress=L6439W,L6314W,L9931W \ No newline at end of file diff --git a/cmsis-pack-examples/common/common.clayer.yml b/cmsis-pack-examples/common/common.clayer.yml index 627776d..02c7c9b 100644 --- a/cmsis-pack-examples/common/common.clayer.yml +++ b/cmsis-pack-examples/common/common.clayer.yml @@ -14,7 +14,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -# yaml-language-server: $schema=https://raw.githubusercontent.com/Open-CMSIS-Pack/devtools/schemas/projmgr/1.2.0/tools/projmgr/schemas/clayer.schema.json +# yaml-language-server: $schema=https://raw.githubusercontent.com/Open-CMSIS-Pack/devtools/schemas/projmgr/1.5.0/tools/projmgr/schemas/clayer.schema.json layer: diff --git a/cmsis-pack-examples/device/alif-ensemble/alif-ensemble-E7-device.clayer.yml b/cmsis-pack-examples/device/alif-ensemble/alif-ensemble-E7-device.clayer.yml index eb87a62..ba103a7 100644 --- a/cmsis-pack-examples/device/alif-ensemble/alif-ensemble-E7-device.clayer.yml +++ b/cmsis-pack-examples/device/alif-ensemble/alif-ensemble-E7-device.clayer.yml @@ -14,7 +14,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -# yaml-language-server: $schema=https://raw.githubusercontent.com/Open-CMSIS-Pack/devtools/schemas/projmgr/1.2.0/tools/projmgr/schemas/clayer.schema.json +# yaml-language-server: $schema=https://raw.githubusercontent.com/Open-CMSIS-Pack/devtools/schemas/projmgr/1.5.0/tools/projmgr/schemas/clayer.schema.json layer: description: Alif Ensemble E7 ML islands' CPU device layer (High-Performance and High-Efficiency Arm Cortex-M55 CPUs). diff --git a/cmsis-pack-examples/device/corstone/corstone-device.clayer.yml b/cmsis-pack-examples/device/corstone/corstone-device.clayer.yml index 8cee174..51db7ac 100644 --- a/cmsis-pack-examples/device/corstone/corstone-device.clayer.yml +++ b/cmsis-pack-examples/device/corstone/corstone-device.clayer.yml @@ -14,7 +14,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -# yaml-language-server: $schema=https://raw.githubusercontent.com/Open-CMSIS-Pack/devtools/schemas/projmgr/1.2.0/tools/projmgr/schemas/clayer.schema.json +# yaml-language-server: $schema=https://raw.githubusercontent.com/Open-CMSIS-Pack/devtools/schemas/projmgr/1.5.0/tools/projmgr/schemas/clayer.schema.json layer: diff --git a/cmsis-pack-examples/device/frdm-k64f/frdm-k64f-device.clayer.yml b/cmsis-pack-examples/device/frdm-k64f/frdm-k64f-device.clayer.yml index 30522d6..d1a3afd 100644 --- a/cmsis-pack-examples/device/frdm-k64f/frdm-k64f-device.clayer.yml +++ b/cmsis-pack-examples/device/frdm-k64f/frdm-k64f-device.clayer.yml @@ -14,7 +14,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -# yaml-language-server: $schema=https://raw.githubusercontent.com/Open-CMSIS-Pack/devtools/schemas/projmgr/1.2.0/tools/projmgr/schemas/clayer.schema.json +# yaml-language-server: $schema=https://raw.githubusercontent.com/Open-CMSIS-Pack/devtools/schemas/projmgr/1.5.0/tools/projmgr/schemas/clayer.schema.json layer: @@ -31,10 +31,6 @@ layer: - file: include/uart_stdout.h - file: include/BoardInit.hpp - misc: - - ASM: - - -masm=gnu - components: - component: NXP::Device:CMSIS:MK64F12_header - component: NXP::Device:CMSIS:MK64F12_system diff --git a/cmsis-pack-examples/device/stm32f746-discovery/stm32f746-discovery-device.clayer.yml b/cmsis-pack-examples/device/stm32f746-discovery/stm32f746-discovery-device.clayer.yml index f689231..3c02b4d 100644 --- a/cmsis-pack-examples/device/stm32f746-discovery/stm32f746-discovery-device.clayer.yml +++ b/cmsis-pack-examples/device/stm32f746-discovery/stm32f746-discovery-device.clayer.yml @@ -14,7 +14,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -# yaml-language-server: $schema=https://raw.githubusercontent.com/Open-CMSIS-Pack/devtools/schemas/projmgr/1.2.0/tools/projmgr/schemas/clayer.schema.json +# yaml-language-server: $schema=https://raw.githubusercontent.com/Open-CMSIS-Pack/devtools/schemas/projmgr/1.5.0/tools/projmgr/schemas/clayer.schema.json layer: diff --git a/cmsis-pack-examples/kws/kws.cproject.yml b/cmsis-pack-examples/kws/kws.cproject.yml index ba01670..8ac7b94 100644 --- a/cmsis-pack-examples/kws/kws.cproject.yml +++ b/cmsis-pack-examples/kws/kws.cproject.yml @@ -14,7 +14,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -# yaml-language-server: $schema=https://raw.githubusercontent.com/Open-CMSIS-Pack/devtools/schemas/projmgr/1.2.0/tools/projmgr/schemas/cproject.schema.json +# yaml-language-server: $schema=https://raw.githubusercontent.com/Open-CMSIS-Pack/devtools/schemas/projmgr/1.5.0/tools/projmgr/schemas/cproject.schema.json project: diff --git a/cmsis-pack-examples/mlek.csolution.yml b/cmsis-pack-examples/mlek.csolution.yml index 57fdcab..687d207 100644 --- a/cmsis-pack-examples/mlek.csolution.yml +++ b/cmsis-pack-examples/mlek.csolution.yml @@ -14,27 +14,10 @@ # See the License for the specific language governing permissions and # limitations under the License. -# yaml-language-server: $schema=https://raw.githubusercontent.com/Open-CMSIS-Pack/devtools/schemas/projmgr/1.2.0/tools/projmgr/schemas/csolution.schema.json +# yaml-language-server: $schema=https://raw.githubusercontent.com/Open-CMSIS-Pack/devtools/schemas/projmgr/1.5.0/tools/projmgr/schemas/csolution.schema.json solution: - # Note that we need AC6@6.18 or higher to compile for Corstone-310 target. - compiler: AC6 - - misc: - - CPP: - - -std=c++14 -fno-exceptions -Wno-license-management -fno-rtti - - C: - - -std=c99 -Wno-license-management - - Link: - - --entry=Reset_Handler - - --verbose - - --callgraph_file='callgraph' - - --map - - --info=sizes,totals,unused,compression,inline,summarysizes - - --list='diagnostics.map' - - --diag_suppress=L6439W,L6314W,L9931W - packs: - pack: ARM::CMSIS@5.9.0 - pack: Arm::ethos-u-core-driver@1.22.5-rc4 @@ -56,17 +39,12 @@ solution: - type: Debug compiler: AC6 debug: on - misc: - - C*: - - -O0 - - -g + optimize: none - type: Release compiler: AC6 debug: off - misc: - - C*: - - -Ofast + optimize: speed target-types: - type: AVH-SSE-300-U55 diff --git a/cmsis-pack-examples/object-detection/object-detection.cproject.yml b/cmsis-pack-examples/object-detection/object-detection.cproject.yml index d3aecc8..48289d4 100644 --- a/cmsis-pack-examples/object-detection/object-detection.cproject.yml +++ b/cmsis-pack-examples/object-detection/object-detection.cproject.yml @@ -14,7 +14,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -# yaml-language-server: $schema=https://raw.githubusercontent.com/Open-CMSIS-Pack/devtools/schemas/projmgr/1.2.0/tools/projmgr/schemas/cproject.schema.json +# yaml-language-server: $schema=https://raw.githubusercontent.com/Open-CMSIS-Pack/devtools/schemas/projmgr/1.5.0/tools/projmgr/schemas/cproject.schema.json project: