Skip to content

Commit

Permalink
Merge pull request #120 from kshitij-sisodia-arm/feature/mleco-4001
Browse files Browse the repository at this point in the history
MLECO-4001: Update cmsis-pack-example to use toolbox v1.5.0
  • Loading branch information
phorsman-arm authored Apr 13, 2023
2 parents 890ea8b + 27567fa commit d4bbec4
Show file tree
Hide file tree
Showing 10 changed files with 49 additions and 37 deletions.
4 changes: 3 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -113,4 +113,6 @@ packlist.txt
*.cprj
RTE/
out/
tmp/
tmp/
*.cbuild.yml
*.cbuild-idx.yml
36 changes: 36 additions & 0 deletions cmsis-pack-examples/.cdefault.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
# SPDX-FileCopyrightText: Copyright 2023 Arm Limited and/or its
# affiliates <[email protected]>
# 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 [email protected] 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
2 changes: 1 addition & 1 deletion cmsis-pack-examples/common/common.clayer.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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).
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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:

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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:

Expand All @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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:

Expand Down
2 changes: 1 addition & 1 deletion cmsis-pack-examples/kws/kws.cproject.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:

Expand Down
28 changes: 3 additions & 25 deletions cmsis-pack-examples/mlek.csolution.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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 [email protected] 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::[email protected]
- pack: Arm::[email protected]
Expand All @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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:

Expand Down

0 comments on commit d4bbec4

Please sign in to comment.