Skip to content
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.

Commit fd46a98

Browse files
phorsman-armphorsman-arm
authoredJul 21, 2023
Merge pull request Arm-Examples#130 from Burton2000/main
MLECO-4226: Moving to csolution 2.0.0
2 parents d3a1a22 + aa3e5f4 commit fd46a98

15 files changed

+132
-220
lines changed
 

‎cmsis-pack-examples/.cdefault.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
# See the License for the specific language governing permissions and
1515
# limitations under the License.
1616

17-
# yaml-language-server: $schema=https://raw.githubusercontent.com/Open-CMSIS-Pack/devtools/schemas/projmgr/1.5.0/tools/projmgr/schemas/cdefault.schema.json
17+
# yaml-language-server: $schema=https://raw.githubusercontent.com/Open-CMSIS-Pack/devtools/schemas/projmgr/2.0.0/tools/projmgr/schemas/cdefault.schema.json
1818

1919
default:
2020
# Note that we need AC6@6.18 or higher to compile for Corstone-310 target.

‎cmsis-pack-examples/README.md

Lines changed: 68 additions & 152 deletions
Large diffs are not rendered by default.

‎cmsis-pack-examples/common/common.clayer.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
# See the License for the specific language governing permissions and
1515
# limitations under the License.
1616

17-
# yaml-language-server: $schema=https://raw.githubusercontent.com/Open-CMSIS-Pack/devtools/schemas/projmgr/1.5.0/tools/projmgr/schemas/clayer.schema.json
17+
# yaml-language-server: $schema=https://raw.githubusercontent.com/Open-CMSIS-Pack/devtools/schemas/projmgr/2.0.0/tools/projmgr/schemas/clayer.schema.json
1818

1919
layer:
2020

@@ -46,7 +46,7 @@ layer:
4646
- component: tensorflow::Machine Learning:TensorFlow:Kernel Utils
4747
# Workaround 4001 (see description above)
4848
define:
49-
- CMSIS_DEVICE_ARM_CORTEX_M_XX_HEADER_FILE=CMSIS_device_header
49+
- CMSIS_DEVICE_ARM_CORTEX_M_XX_HEADER_FILE: CMSIS_device_header
5050
- component: tensorflow::Machine Learning:TensorFlow:Testing
5151
- component: ARM::ML Eval Kit:Common:API
5252
- component: ARM::ML Eval Kit:Common:Log

‎cmsis-pack-examples/device/alif-ensemble/alif-ensemble-E7-device.clayer.yml

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
# See the License for the specific language governing permissions and
1515
# limitations under the License.
1616

17-
# yaml-language-server: $schema=https://raw.githubusercontent.com/Open-CMSIS-Pack/devtools/schemas/projmgr/1.5.0/tools/projmgr/schemas/clayer.schema.json
17+
# yaml-language-server: $schema=https://raw.githubusercontent.com/Open-CMSIS-Pack/devtools/schemas/projmgr/2.0.0/tools/projmgr/schemas/clayer.schema.json
1818

1919
layer:
2020
description: Alif Ensemble E7 ML islands' CPU device layer (High-Performance and High-Efficiency Arm Cortex-M55 CPUs).
@@ -29,20 +29,20 @@ layer:
2929
- file: ./src/gpio.c
3030

3131
- group: AudioHelpers
32-
for-type: +Alif-E7-M55-HE
32+
for-context: +Alif-E7-M55-HE
3333
files:
3434
- file: ./src/BoardAudioUtils.cpp
3535
- file: ./src/BoardPlotUtils.cpp
3636
- file: ./include/BoardAudioUtils.hpp
3737
- file: ./include/BoardPlotUtils.hpp
3838

3939
- group: CameraHelpers
40-
for-type: +Alif-E7-M55-HP
40+
for-context: +Alif-E7-M55-HP
4141
files:
4242
- file: ./src/CameraCapture.cpp
4343

4444
- group: Display
45-
for-type: +Alif-E7-M55-HP
45+
for-context: +Alif-E7-M55-HP
4646
files:
4747
- file: ./src/LcdDisplay.cpp
4848

@@ -71,28 +71,28 @@ layer:
7171
- component: AlifSemiconductor::Device:SE Services:MHU Driver
7272

7373
- component: AlifSemiconductor::Device:SOC Peripherals:DMA
74-
for-type: +Alif-E7-M55-HE
74+
for-context: +Alif-E7-M55-HE
7575

7676
- component: AlifSemiconductor::Device:SOC Peripherals:I2S
77-
for-type: +Alif-E7-M55-HE
77+
for-context: +Alif-E7-M55-HE
7878

7979
- component: AlifSemiconductor::Device:SOC Peripherals:I3C
80-
for-type: +Alif-E7-M55-HP
80+
for-context: +Alif-E7-M55-HP
8181

8282
- component: AlifSemiconductor::Device:SOC Peripherals:CDC200
83-
for-type: +Alif-E7-M55-HP
83+
for-context: +Alif-E7-M55-HP
8484

8585
- component: AlifSemiconductor::Device:SOC Peripherals:MIPI CSI2
86-
for-type: +Alif-E7-M55-HP
86+
for-context: +Alif-E7-M55-HP
8787

8888
- component: AlifSemiconductor::Device:SOC Peripherals:MIPI DSI
89-
for-type: +Alif-E7-M55-HP
89+
for-context: +Alif-E7-M55-HP
9090

9191
- component: AlifSemiconductor::Device:SOC Peripherals:CAMERA Controller
92-
for-type: +Alif-E7-M55-HP
92+
for-context: +Alif-E7-M55-HP
9393

9494
- component: AlifSemiconductor::BSP:External peripherals:ILI9806E LCD panel
95-
for-type: +Alif-E7-M55-HP
95+
for-context: +Alif-E7-M55-HP
9696

9797
- component: AlifSemiconductor::BSP:External peripherals:CAMERA Sensor ARX3A0
98-
for-type: +Alif-E7-M55-HP
98+
for-context: +Alif-E7-M55-HP

‎cmsis-pack-examples/device/corstone/corstone-device.clayer.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,15 +14,15 @@
1414
# See the License for the specific language governing permissions and
1515
# limitations under the License.
1616

17-
# yaml-language-server: $schema=https://raw.githubusercontent.com/Open-CMSIS-Pack/devtools/schemas/projmgr/1.5.0/tools/projmgr/schemas/clayer.schema.json
17+
# yaml-language-server: $schema=https://raw.githubusercontent.com/Open-CMSIS-Pack/devtools/schemas/projmgr/2.0.0/tools/projmgr/schemas/clayer.schema.json
1818

1919
layer:
2020

2121
description: Corstone-300/310 device related components and files.
2222

2323
groups:
2424
- group: Retarget
25-
for-type:
25+
for-context:
2626
- +AVH-SSE-300-U55
2727
- +AVH-SSE-310-U55
2828
- +AVH-SSE-300-U65
@@ -42,11 +42,11 @@ layer:
4242
- component: ARM::Native Driver:SysCounter
4343
- component: ARM::Native Driver:SysTimer
4444
- component: Arm::Machine Learning:NPU Support:Ethos-U Driver&Generic U55
45-
for-type:
45+
for-context:
4646
- +AVH-SSE-300-U55
4747
- +AVH-SSE-310-U55
4848
- component: Arm::Machine Learning:NPU Support:Ethos-U Driver&Generic U65
49-
for-type:
49+
for-context:
5050
- +AVH-SSE-300-U65
5151
- +AVH-SSE-310-U65
5252
- component: tensorflow::Machine Learning:TensorFlow:Kernel&Ethos-U

‎cmsis-pack-examples/device/frdm-k64f/frdm-k64f-device.clayer.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,15 +14,15 @@
1414
# See the License for the specific language governing permissions and
1515
# limitations under the License.
1616

17-
# yaml-language-server: $schema=https://raw.githubusercontent.com/Open-CMSIS-Pack/devtools/schemas/projmgr/1.5.0/tools/projmgr/schemas/clayer.schema.json
17+
# yaml-language-server: $schema=https://raw.githubusercontent.com/Open-CMSIS-Pack/devtools/schemas/projmgr/2.0.0/tools/projmgr/schemas/clayer.schema.json
1818

1919
layer:
2020

2121
description: NXP FRDM-K64F device related components and files.
2222

2323
groups:
2424
- group: Retarget
25-
for-type:
25+
for-context:
2626
- +FRDM-K64F
2727
files:
2828
- file: src/retarget.c

‎cmsis-pack-examples/device/stm32f746-discovery/stm32f746-discovery-device.clayer.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,23 +14,23 @@
1414
# See the License for the specific language governing permissions and
1515
# limitations under the License.
1616

17-
# yaml-language-server: $schema=https://raw.githubusercontent.com/Open-CMSIS-Pack/devtools/schemas/projmgr/1.5.0/tools/projmgr/schemas/clayer.schema.json
17+
# yaml-language-server: $schema=https://raw.githubusercontent.com/Open-CMSIS-Pack/devtools/schemas/projmgr/2.0.0/tools/projmgr/schemas/clayer.schema.json
1818

1919
layer:
2020

2121
description: ST Micro STM32F746G-Discovery device related components and files.
2222

2323
groups:
2424
- group: Retarget
25-
for-type:
25+
for-context:
2626
- +STM32F746-DISCO
2727
files:
2828
- file: src/retarget.c
2929
- file: src/uart_stdout.c
3030
- file: src/uart_stdout.h
3131

3232
- group: Device
33-
for-type:
33+
for-context:
3434
- +STM32F746-DISCO
3535
files:
3636
- file: src/BoardInit.cpp
@@ -42,7 +42,7 @@ layer:
4242
- file: include/BoardPlotUtils.hpp
4343

4444
- group: Startup
45-
for-type:
45+
for-context:
4646
- +STM32F746-DISCO
4747

4848
files:

‎cmsis-pack-examples/docs/01-install-cmsis-packs.png

17.9 KB
Loading

‎cmsis-pack-examples/docs/02-build-run.png

55.9 KB
Loading

‎cmsis-pack-examples/kws/kws.cproject.yml

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -14,13 +14,13 @@
1414
# See the License for the specific language governing permissions and
1515
# limitations under the License.
1616

17-
# yaml-language-server: $schema=https://raw.githubusercontent.com/Open-CMSIS-Pack/devtools/schemas/projmgr/1.5.0/tools/projmgr/schemas/cproject.schema.json
17+
# yaml-language-server: $schema=https://raw.githubusercontent.com/Open-CMSIS-Pack/devtools/schemas/projmgr/2.0.0/tools/projmgr/schemas/cproject.schema.json
1818

1919
project:
2020

2121
groups:
2222
- group: Wav file based example
23-
for-type:
23+
for-context:
2424
- +AVH-SSE-300-U65
2525
- +AVH-SSE-310-U65
2626
- +AVH-SSE-300-U55
@@ -34,7 +34,7 @@ project:
3434
- file: src/main_wav.cpp
3535

3636
- group: Live audio based example
37-
for-type:
37+
for-context:
3838
- +STM32F746-DISCO
3939
- +Alif-E7-M55-HE
4040

@@ -47,63 +47,63 @@ project:
4747
- file: src/Labels.cpp
4848

4949
- file: src/kws_micronet_m_vela_H128.tflite.cpp
50-
for-type:
50+
for-context:
5151
- +Alif-E7-M55-HE
5252

5353
- file: src/kws_micronet_m_vela_H256.tflite.cpp
54-
for-type:
54+
for-context:
5555
- +AVH-SSE-300-U55
5656
- +AVH-SSE-310-U55
5757

5858
- file: src/kws_micronet_m_vela_Y256.tflite.cpp
59-
for-type:
59+
for-context:
6060
- +AVH-SSE-300-U65
6161
- +AVH-SSE-310-U65
6262

6363
- file: src/kws_micronet_m.tflite.cpp
64-
for-type:
64+
for-context:
6565
- +FRDM-K64F
6666
- +STM32F746-DISCO
6767

6868
- group: Device Files
6969
files:
7070
- file: linker/mps3-sse-300.sct
71-
for-type:
71+
for-context:
7272
- +AVH-SSE-300-U55
7373
- +AVH-SSE-300-U65
7474
- file: linker/mps3-sse-310.sct
75-
for-type:
75+
for-context:
7676
- +AVH-SSE-310-U55
7777
- +AVH-SSE-310-U65
7878
- file: linker/frdm-k64f.sct
79-
for-type: +FRDM-K64F
79+
for-context: +FRDM-K64F
8080
- file: linker/stm32f746-disco.sct
81-
for-type: +STM32F746-DISCO
81+
for-context: +STM32F746-DISCO
8282
- file: linker/alif-e7-m55-he.sct
83-
for-type: +Alif-E7-M55-HE
83+
for-context: +Alif-E7-M55-HE
8484

8585
define:
86-
- ACTIVATION_BUF_SZ=131072
86+
- ACTIVATION_BUF_SZ: 131072
8787

8888
layers:
8989
- layer: ../common/common.clayer.yml
9090
- layer: ../device/corstone/corstone-device.clayer.yml
91-
for-type:
91+
for-context:
9292
- +AVH-SSE-300-U55
9393
- +AVH-SSE-300-U65
9494
- +AVH-SSE-310-U55
9595
- +AVH-SSE-310-U65
9696

9797
- layer: ../device/frdm-k64f/frdm-k64f-device.clayer.yml
98-
for-type:
98+
for-context:
9999
- +FRDM-K64F
100100

101101
- layer: ../device/stm32f746-discovery/stm32f746-discovery-device.clayer.yml
102-
for-type:
102+
for-context:
103103
- +STM32F746-DISCO
104104

105105
- layer: ../device/alif-ensemble/alif-ensemble-E7-device.clayer.yml
106-
for-type:
106+
for-context:
107107
- +Alif-E7-M55-HE
108108

109109
components:

‎cmsis-pack-examples/kws/linker/alif-e7-m55-he.sct

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#! armclang -E --target=arm-arm-none-eabi -mcpu=cortex-m55 -xc
22
; command above MUST be in first line (no comment above!)
3-
#include "../RTE/Device/AE722F80F55D5TE_M55_HE/M55_HE_map.h"
3+
#include "../../device/alif-ensemble/RTE/Device/AE722F80F55D5TE_M55_HE/M55_HE_map.h"
44

55
; SPDX-FileCopyrightText: Copyright 2022-2023 Arm Limited and/or its
66
; affiliates <open-source-office@arm.com>
@@ -53,7 +53,6 @@ LOAD_REGION_0 ROM_BASE SRAM4_SIZE
5353
*.o (RESET, +First)
5454
* (InRoot$$Sections)
5555
.ANY (+RO-CODE)
56-
Driver_*.o (+RO +RW +ZI)
5756
}
5857

5958
;-----------------------------------------------------
@@ -102,6 +101,7 @@ LOAD_REGION_1 MODEL_BASE SRAM1_USABLE_SIZE
102101
{
103102
.ANY (+RO-DATA)
104103
.ANY (+RW +ZI)
104+
Driver_*.o (+RO +RW +ZI)
105105
}
106106

107107
;-----------------------------------------------------

‎cmsis-pack-examples/mlek.csolution.yml

Lines changed: 6 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,9 @@
1414
# See the License for the specific language governing permissions and
1515
# limitations under the License.
1616

17-
# yaml-language-server: $schema=https://raw.githubusercontent.com/Open-CMSIS-Pack/devtools/schemas/projmgr/1.5.0/tools/projmgr/schemas/csolution.schema.json
17+
# yaml-language-server: $schema=https://raw.githubusercontent.com/Open-CMSIS-Pack/devtools/schemas/projmgr/2.0.0/tools/projmgr/schemas/csolution.schema.json
1818

1919
solution:
20-
2120
packs:
2221
- pack: ARM::CMSIS@5.9.0
2322
- pack: ARM::CMSIS-DSP@1.14.4
@@ -71,16 +70,16 @@ solution:
7170
device: AE722F80F55D5TE:M55_HP
7271
define:
7372
- ETHOSU55
74-
- USART_DRV_NUM=2
73+
- USART_DRV_NUM: 2
7574

7675
- type: Alif-E7-M55-HE
7776
device: AE722F80F55D5TE:M55_HE
7877
define:
7978
- ETHOSU55
80-
- USART_DRV_NUM=4
79+
- USART_DRV_NUM: 4
8180

8281
# NOTE: Currently Keil Studio Cloud doesn't allow switching between different NPU configurations.
83-
# Applicatons produced by this build will only work if the FVP is run manually.
82+
# Applications produced by this build will only work if the FVP is run manually.
8483
- type: AVH-SSE-300-U65
8584
device: ARM::SSE-300-MPS3
8685
define:
@@ -91,19 +90,16 @@ solution:
9190
define:
9291
- ETHOSU65
9392

94-
output-dirs:
95-
rtedir: ./$Project$/RTE
96-
9793
projects:
9894
- project: ./object-detection/object-detection.cproject.yml
99-
for-type:
95+
for-context:
10096
- +AVH-SSE-300-U65
10197
- +AVH-SSE-310-U65
10298
- +AVH-SSE-300-U55
10399
- +AVH-SSE-310-U55
104100
- +Alif-E7-M55-HP
105101
- project: ./kws/kws.cproject.yml
106-
for-type:
102+
for-context:
107103
- +AVH-SSE-300-U65
108104
- +AVH-SSE-310-U65
109105
- +AVH-SSE-300-U55

‎cmsis-pack-examples/object-detection/linker/alif-e7-m55-hp.sct

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#! armclang -E --target=arm-arm-none-eabi -mcpu=cortex-m55 -xc
22
; command above MUST be in first line (no comment above!)
3-
#include "../RTE/Device/AE722F80F55D5TE_M55_HP/M55_HP_map.h"
3+
#include "../../device/alif-ensemble/RTE/Device/AE722F80F55D5TE_M55_HP/M55_HP_map.h"
44

55
; SPDX-FileCopyrightText: Copyright 2022-2023 Arm Limited and/or its
66
; affiliates <open-source-office@arm.com>
There was a problem loading the remainder of the diff.

0 commit comments

Comments
 (0)
Failed to load comments.