Merge pull request #131 from Burton2000/main

MLECO-4242: Additional fixes for csolution 2.0
ARM-software · Aug 1, 2023 · d4816d1 · d4816d1
2 parents fd46a98 + 6d824b7
commit d4816d1
Show file tree

Hide file tree

Showing 7 changed files with 42,623 additions and 1 deletion.
diff --git a/cmsis-pack-examples/.cdefault.yml → cmsis-pack-examples/cdefault.yml b/cmsis-pack-examples/.cdefault.yml → cmsis-pack-examples/cdefault.yml
diff --git a/cmsis-pack-examples/device/corstone/corstone-device.clayer.yml b/cmsis-pack-examples/device/corstone/corstone-device.clayer.yml
@@ -23,6 +23,8 @@ layer:
   groups:
     - group: Retarget
       for-context:
+        - +AVH-SSE-300
+        - +AVH-SSE-310
         - +AVH-SSE-300-U55
         - +AVH-SSE-310-U55
         - +AVH-SSE-300-U65
@@ -50,3 +52,12 @@ layer:
         - +AVH-SSE-300-U65
         - +AVH-SSE-310-U65
     - component: tensorflow::Machine Learning:TensorFlow:Kernel&Ethos-U
+      for-context:
+        - +AVH-SSE-300-U55
+        - +AVH-SSE-310-U55
+        - +AVH-SSE-300-U65
+        - +AVH-SSE-310-U65
+    - component: tensorflow::Machine Learning:TensorFlow:Kernel&CMSIS-NN
+      for-context:
+        - +AVH-SSE-300
+        - +AVH-SSE-310
diff --git a/cmsis-pack-examples/kws/kws.cproject.yml b/cmsis-pack-examples/kws/kws.cproject.yml
@@ -21,6 +21,8 @@ project:
   groups:
     - group: Wav file based example
       for-context:
+        - +AVH-SSE-300
+        - +AVH-SSE-310
         - +AVH-SSE-300-U65
         - +AVH-SSE-310-U65
         - +AVH-SSE-300-U55
@@ -64,15 +66,19 @@ project:
           for-context:
             - +FRDM-K64F
             - +STM32F746-DISCO
+            - +AVH-SSE-300
+            - +AVH-SSE-310
 
     - group: Device Files
       files:
         - file: linker/mps3-sse-300.sct
           for-context:
+            - +AVH-SSE-300
             - +AVH-SSE-300-U55
             - +AVH-SSE-300-U65
         - file: linker/mps3-sse-310.sct
           for-context:
+            - +AVH-SSE-310
             - +AVH-SSE-310-U55
             - +AVH-SSE-310-U65
         - file: linker/frdm-k64f.sct
@@ -89,8 +95,10 @@ project:
     - layer: ../common/common.clayer.yml
     - layer: ../device/corstone/corstone-device.clayer.yml
       for-context:
+        - +AVH-SSE-300
         - +AVH-SSE-300-U55
         - +AVH-SSE-300-U65
+        - +AVH-SSE-310
         - +AVH-SSE-310-U55
         - +AVH-SSE-310-U65
 

diff --git a/cmsis-pack-examples/kws/linker/alif-e7-m55-he.sct b/cmsis-pack-examples/kws/linker/alif-e7-m55-he.sct
@@ -53,6 +53,7 @@ LOAD_REGION_0       ROM_BASE                    SRAM4_SIZE
         *.o (RESET, +First)
         * (InRoot$$Sections)
         .ANY (+RO-CODE)
+        Driver_*.o (+RO +RW +ZI)
     }
 
     ;-----------------------------------------------------
@@ -101,7 +102,6 @@ LOAD_REGION_1       MODEL_BASE           SRAM1_USABLE_SIZE
     {
         .ANY        (+RO-DATA)
         .ANY        (+RW +ZI)
-        Driver_*.o (+RO +RW +ZI)
     }
 
     ;-----------------------------------------------------

diff --git a/cmsis-pack-examples/mlek.csolution.yml b/cmsis-pack-examples/mlek.csolution.yml
@@ -17,6 +17,10 @@
 # yaml-language-server: $schema=https://raw.githubusercontent.com/Open-CMSIS-Pack/devtools/schemas/projmgr/2.0.0/tools/projmgr/schemas/csolution.schema.json
 
 solution:
+  created-for: cmsis-toolbox@2.0.0
+  compiler: AC6
+  cdefault: # use default setup of toolchain specific controls.
+
   packs:
     - pack: ARM::CMSIS@5.9.0
     - pack: ARM::CMSIS-DSP@1.14.4
@@ -48,11 +52,17 @@ solution:
       optimize: speed
 
   target-types:
+    - type: AVH-SSE-300
+      device: ARM::SSE-300-MPS3
+
     - type: AVH-SSE-300-U55
       device: ARM::SSE-300-MPS3
       define:
         - ETHOSU55
 
+    - type: AVH-SSE-310
+      device: ARM::SSE-310-MPS3
+
     - type: AVH-SSE-310-U55
       device: ARM::SSE-310-MPS3
       define:
@@ -97,13 +107,17 @@ solution:
         - +AVH-SSE-310-U65
         - +AVH-SSE-300-U55
         - +AVH-SSE-310-U55
+        - +AVH-SSE-300
+        - +AVH-SSE-310
         - +Alif-E7-M55-HP
     - project: ./kws/kws.cproject.yml
       for-context:
         - +AVH-SSE-300-U65
         - +AVH-SSE-310-U65
         - +AVH-SSE-300-U55
         - +AVH-SSE-310-U55
+        - +AVH-SSE-300
+        - +AVH-SSE-310
         - +FRDM-K64F
         - +STM32F746-DISCO
         - +Alif-E7-M55-HE
diff --git a/cmsis-pack-examples/object-detection/object-detection.cproject.yml b/cmsis-pack-examples/object-detection/object-detection.cproject.yml
@@ -24,6 +24,10 @@ project:
         - file: include/InputFiles.hpp
         - file: src/InputFiles.cpp
         - file: src/sample_image.cpp
+        - file: src/yolo-fastest_192_face_v4.tflite.cpp
+          for-context:
+            - +AVH-SSE-300
+            - +AVH-SSE-310
         - file: src/yolo-fastest_192_face_v4_vela_H256.tflite.cpp
           for-context:
             - +AVH-SSE-300-U55
@@ -35,8 +39,10 @@ project:
             - +AVH-SSE-310-U65
         - file: src/main_static.cpp
           for-context:
+            - +AVH-SSE-300
             - +AVH-SSE-300-U55
             - +AVH-SSE-300-U65
+            - +AVH-SSE-310
             - +AVH-SSE-310-U55
             - +AVH-SSE-310-U65
         - file: src/main_live.cpp
@@ -47,10 +53,12 @@ project:
       files:
         - file: linker/mps3-sse-300.sct
           for-context:
+            - +AVH-SSE-300
             - +AVH-SSE-300-U55
             - +AVH-SSE-300-U65
         - file: linker/mps3-sse-310.sct
           for-context:
+            - +AVH-SSE-310
             - +AVH-SSE-310-U55
             - +AVH-SSE-310-U65
         - file: linker/alif-e7-m55-hp.sct
@@ -65,8 +73,10 @@ project:
 
     - layer: ../device/corstone/corstone-device.clayer.yml
       for-context:
+        - +AVH-SSE-300
         - +AVH-SSE-300-U55
         - +AVH-SSE-300-U65
+        - +AVH-SSE-310
         - +AVH-SSE-310-U55
         - +AVH-SSE-310-U65