From 4b9c194d8b538512b5554500a61ab167d76fc70c Mon Sep 17 00:00:00 2001
From: MatthiasHertel80 <Matthias.Hertel@arm.com>
Date: Mon, 4 Oct 2021 12:45:31 +0200
Subject: [PATCH] Updating examples to new pack

---
 .../microspeech.Example_Test.cprj             | 131 ++++++++++++++++++
 .../microspeech.uvoptx                        |  18 +--
 .../microspeech.uvprojx                       |  14 +-
 Platform_IMXRT1050-EVKB/microspeech.uvoptx    |  28 ++--
 Platform_IMXRT1050-EVKB/microspeech.uvprojx   |  56 ++++----
 Platform_MIMXRT1064-EVK/microspeech.uvoptx    |   6 +-
 Platform_MIMXRT1064-EVK/microspeech.uvprojx   |  12 +-
 7 files changed, 200 insertions(+), 65 deletions(-)
 create mode 100644 Platform_FVP_Corstone_SSE-300_Ethos-U55/microspeech.Example_Test.cprj

diff --git a/Platform_FVP_Corstone_SSE-300_Ethos-U55/microspeech.Example_Test.cprj b/Platform_FVP_Corstone_SSE-300_Ethos-U55/microspeech.Example_Test.cprj
new file mode 100644
index 0000000..e807a4b
--- /dev/null
+++ b/Platform_FVP_Corstone_SSE-300_Ethos-U55/microspeech.Example_Test.cprj
@@ -0,0 +1,131 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
+<cprj schemaVersion="0.0.9" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="CPRJ.xsd">
+
+  <created timestamp="2021-10-04T12:43:09" tool="uVision V5.35.0.0"/>
+
+  <info>
+    <name>Blinky</name>
+    <description/>
+  </info>
+
+  <packages>
+    <package name="CMSIS" vendor="ARM"/>
+    <package name="V2M_MPS3_SSE_300_BSP" vendor="ARM"/>
+    <package name="flatbuffers" vendor="tensorflow"/>
+    <package name="gemmlowp" vendor="tensorflow"/>
+    <package name="kissfft" vendor="tensorflow"/>
+    <package name="ruy" vendor="tensorflow"/>
+    <package name="tensorflow-lite-micro" vendor="tensorflow"/>
+    <package name="ARM_Compiler" vendor="Keil"/>
+  </packages>
+
+  <compilers>
+    <compiler name="AC6" version="6.0.0:6.99.99"/>
+  </compilers>
+
+  <target Ddsp="DSP" Dendian="Little-endian" Dfpu="NO_FPU" Dmve="NO_MVE" Dname="SSE-300-MPS3" Dsecure="TZ-disabled" Dtz="TZ" Dvendor="ARM:82">
+    <output intdir="./Objects/" name="microspeech" outdir="./Objects/" type="exe"/>
+    <ldflags add="--strict --diag_suppress 6439,6314 --summary_stderr --info summarysizes --map --load_addr_map_info --xref --callgraph --symbols --info sizes --info totals --info unused --info veneers --entry=Reset_Handler" compiler="AC6" file="./RTE/Device/SSE-300-MPS3/fvp_sse300_mps3_s.sct"/>
+    <cflags add="-Os -Wno-documentation -Wno-documentation-unknown-command -Wno-license-management -Wno-missing-noreturn -Wno-missing-prototypes -Wno-missing-variable-declarations -Wno-nonportable-include-path -Wno-packed -Wno-parentheses-equality -Wno-reserved-id-macro -Wno-sign-conversion -Wno-unused-macros -ffunction-sections -fno-rtti -fshort-enums -fshort-wchar -funsigned-char -gdwarf-4 -std=c99 -xc" compiler="AC6"/>
+    <cxxflags add="-Os -Wno-documentation -Wno-documentation-unknown-command -Wno-license-management -Wno-missing-noreturn -Wno-missing-prototypes -Wno-missing-variable-declarations -Wno-nonportable-include-path -Wno-packed -Wno-parentheses-equality -Wno-reserved-id-macro -Wno-sign-conversion -Wno-unused-macros -ffunction-sections -fno-exceptions -fno-rtti -fshort-enums -fshort-wchar -funsigned-char -gdwarf-4 -std=c++14 -xc++" compiler="AC6"/>
+    <asflags add="-gdwarf-3 -masm=gnu" compiler="AC6"/>
+    <includes>../VSI/audio/include;../VSI/include;../micro_speech/src</includes>
+    <defines>__FVP_PY;__TEST</defines>
+  </target>
+
+  <components>
+    <component Cclass="CMSIS" Cgroup="CORE" Cvendor="ARM"/>
+    <component Cclass="CMSIS" Cgroup="DSP" Cvariant="Source" Cvendor="ARM"/>
+    <component Cclass="CMSIS" Cgroup="NN Lib" Cvendor="ARM"/>
+    <component Cclass="CMSIS" Cgroup="RTOS2" Csub="Keil RTX5" Cvariant="Source" Cvendor="ARM">
+      <file attr="config" category="source" name="CMSIS/RTOS2/RTX/Config/RTX_Config.c" version="5.1.1"/>
+      <file attr="config" category="header" name="CMSIS/RTOS2/RTX/Config/RTX_Config.h" version="5.5.2"/>
+    </component>
+    <component Cclass="CMSIS Driver" Cgroup="MPC" Cvendor="ARM"/>
+    <component Cclass="CMSIS Driver" Cgroup="PPC" Cvendor="ARM"/>
+    <component Cclass="CMSIS Driver" Cgroup="SPI" Cvendor="ARM"/>
+    <component Cclass="CMSIS Driver" Cgroup="USART" Cvendor="ARM"/>
+    <component Cclass="Data Exchange" Cgroup="Serialization" Csub="flatbuffers" Cvariant="tensorflow" Cvendor="tensorflow"/>
+    <component Cclass="Data Processing" Cgroup="Math" Csub="gemmlowp fixed-point" Cvariant="tensorflow" Cvendor="tensorflow"/>
+    <component Cclass="Data Processing" Cgroup="Math" Csub="kissfft" Cvariant="tensorflow" Cvendor="tensorflow"/>
+    <component Cclass="Data Processing" Cgroup="Math" Csub="ruy" Cvariant="tensorflow" Cvendor="tensorflow"/>
+    <component Cclass="Device" Cgroup="Definition" Cvendor="ARM">
+      <file attr="config" category="header" name="Board/Platform/platform_base_address.h" version="1.1.2"/>
+      <file attr="config" category="source" name="Device/Source/system_SSE300MPS3.c" version="1.1.1"/>
+    </component>
+    <component Cclass="Device" Cgroup="Startup" Cvariant="Baremetal" Cvendor="ARM">
+      <file attr="config" category="header" name="CMSIS_Driver/Config/Baremetal/cmsis_driver_config.h" version="1.1.1"/>
+      <file attr="config" category="header" name="CMSIS_Driver/Config/RTE_Device.h" version="1.1.0"/>
+      <file attr="config" category="header" name="Device/Config/Baremetal/device_cfg.h" version="1.1.2"/>
+      <file attr="config" category="header" name="Device/Include/region_defs.h" version="1.0.0"/>
+      <file attr="config" category="header" name="Device/Include/region_limits.h" version="1.0.0"/>
+      <file attr="config" category="linkerScript" name="Device/Source/armclang/fvp_sse300_mps3_s.sct" version="1.1.0"/>
+      <file attr="config" category="source" name="Device/Source/startup_fvp_sse300_mps3.c" version="1.1.1"/>
+    </component>
+    <component Cclass="Machine Learning" Cgroup="TensorFlow" Csub="Kernel" Cvariant="CMSIS-NN" Cvendor="tensorflow"/>
+    <component Cclass="Machine Learning" Cgroup="TensorFlow" Csub="Kernel Utils" Cvendor="tensorflow">
+      <file attr="config" category="sourceCpp" name="tensorflow/lite/micro/cortex_m_generic/debug_log.cc" version="1.0"/>
+      <file attr="config" category="sourceCpp" name="tensorflow/lite/micro/cortex_m_generic/micro_time.cc" version="1.0"/>
+      <file attr="config" category="sourceCpp" name="tensorflow/lite/micro/system_setup.cc" version="1.0"/>
+    </component>
+    <component Cclass="Native Driver" Cgroup="GPIO" Cvendor="ARM"/>
+    <component Cclass="Native Driver" Cgroup="IO" Cvendor="ARM"/>
+    <component Cclass="Native Driver" Cgroup="MPC" Cvendor="ARM"/>
+    <component Cclass="Native Driver" Cgroup="PPC" Cvendor="ARM"/>
+    <component Cclass="Native Driver" Cgroup="SPI" Cvendor="ARM"/>
+    <component Cclass="Native Driver" Cgroup="SysCounter" Cvendor="ARM"/>
+    <component Cclass="Native Driver" Cgroup="SysTimer" Cvendor="ARM"/>
+    <component Cclass="Native Driver" Cgroup="UART" Cvendor="ARM"/>
+    <component Cclass="Native Driver" Cgroup="Watch Dog" Cvendor="ARM"/>
+    <component Cbundle="ARM Compiler" Cclass="Compiler" Cgroup="Event Recorder" Cvariant="DAP" Cvendor="Keil">
+      <file attr="config" category="header" name="Config/EventRecorderConf.h" version="1.1.0"/>
+    </component>
+    <component Cbundle="ARM Compiler" Cclass="Compiler" Cgroup="I/O" Csub="STDOUT" Cvariant="User" Cvendor="Keil"/>
+  </components>
+
+  <files>
+    <group name="Board">
+      <file category="header" name="./main.h"/>
+    </group>
+    <group name="Board IO">
+      <file category="sourceC" name="./Board_IO/retarget_stdio.c"/>
+    </group>
+    <group name="Driver">
+      <file category="sourceC" name="../VSI/audio/driver/audio_drv.c"/>
+    </group>
+    <group name="TF_micro_frontend">
+      <file category="sourceCpp" name="../micro_speech/src/microfrontend/lib/fft.cc"/>
+      <file category="sourceCpp" name="../micro_speech/src/microfrontend/lib/fft_util.cc"/>
+      <file category="sourceC" name="../micro_speech/src/microfrontend/lib/filterbank.c"/>
+      <file category="sourceC" name="../micro_speech/src/microfrontend/lib/filterbank_util.c"/>
+      <file category="sourceC" name="../micro_speech/src/microfrontend/lib/frontend.c"/>
+      <file category="sourceC" name="../micro_speech/src/microfrontend/lib/frontend_util.c"/>
+      <file category="sourceC" name="../micro_speech/src/microfrontend/lib/log_lut.c"/>
+      <file category="sourceC" name="../micro_speech/src/microfrontend/lib/log_scale.c"/>
+      <file category="sourceC" name="../micro_speech/src/microfrontend/lib/log_scale_util.c"/>
+      <file category="sourceC" name="../micro_speech/src/microfrontend/lib/noise_reduction.c"/>
+      <file category="sourceC" name="../micro_speech/src/microfrontend/lib/noise_reduction_util.c"/>
+      <file category="sourceC" name="../micro_speech/src/microfrontend/lib/pcan_gain_control.c"/>
+      <file category="sourceC" name="../micro_speech/src/microfrontend/lib/pcan_gain_control_util.c"/>
+      <file category="sourceC" name="../micro_speech/src/microfrontend/lib/window.c"/>
+      <file category="sourceC" name="../micro_speech/src/microfrontend/lib/window_util.c"/>
+    </group>
+    <group name="TF_micro_features">
+      <file category="sourceCpp" name="../micro_speech/src/micro_features/micro_features_generator.cc"/>
+      <file category="sourceCpp" name="../micro_speech/src/micro_features/micro_model_settings.cc"/>
+      <file category="sourceCpp" name="../micro_speech/src/micro_features/model.cc"/>
+      <file category="sourceCpp" name="../micro_speech/src/micro_features/no_micro_features_data.cc"/>
+      <file category="sourceCpp" name="../micro_speech/src/micro_features/yes_micro_features_data.cc"/>
+    </group>
+    <group name="TF_main">
+      <file category="sourceCpp" name="../micro_speech/src/audio_provider.cc"/>
+      <file category="sourceCpp" name="../micro_speech/src/command_responder.cc"/>
+      <file category="sourceCpp" name="../micro_speech/src/feature_provider.cc"/>
+      <file category="sourceCpp" name="../micro_speech/src/recognize_commands.cc"/>
+    </group>
+    <group name="TF_test">
+      <file category="sourceCpp" name="../micro_speech/src/micro_speech_test.cc"/>
+    </group>
+  </files>
+
+</cprj>
diff --git a/Platform_FVP_Corstone_SSE-300_Ethos-U55/microspeech.uvoptx b/Platform_FVP_Corstone_SSE-300_Ethos-U55/microspeech.uvoptx
index a3d4b45..069fec4 100644
--- a/Platform_FVP_Corstone_SSE-300_Ethos-U55/microspeech.uvoptx
+++ b/Platform_FVP_Corstone_SSE-300_Ethos-U55/microspeech.uvoptx
@@ -75,7 +75,7 @@
       <OPTFL>
         <tvExp>1</tvExp>
         <tvExpOptDlg>0</tvExpOptDlg>
-        <IsCurrentTarget>1</IsCurrentTarget>
+        <IsCurrentTarget>0</IsCurrentTarget>
       </OPTFL>
       <CpuCode>7</CpuCode>
       <DebugOpt>
@@ -145,7 +145,7 @@
         <SetRegEntry>
           <Number>0</Number>
           <Key>DbgFMv8M</Key>
-          <Name>-I -S"System Generator:cpu_core" -L"cpu_core.cpu0" -O4102 -C0 -MC"..\..\Program Files\Arm\VHT\models\Win64_VC2017\VHT-Corstone-300.exe" -MF"fvp_config.txt" -PF -MA"-V "..\VSI\audio\python" -C cpu_core.mps3_board.telnetterminal0.start_telnet=1"</Name>
+          <Name>-I -S"System Generator:cpu_core" -L"cpu_core.cpu0" -O4102 -C0 -MC"..\..\Program Files\ARM\arm_vsi\Build_Corstone_SSE-300_Ethos-U55\system\systemc-peripheral-example.exe" -MF"fvp_config.txt" -PF -MA"-V "..\VSI\audio\python" -C cpu_core.mps3_board.telnetterminal0.start_telnet=1"</Name>
         </SetRegEntry>
         <SetRegEntry>
           <Number>0</Number>
@@ -155,12 +155,12 @@
       </TargetDriverDllRegistry>
       <Breakpoint/>
       <ScvdPack>
-        <Filename>C:\ARM\PACK\ARM\CMSIS\5.8.0\CMSIS\RTOS2\RTX\RTX5.scvd</Filename>
+        <Filename>C:\Packs\ARM\CMSIS\5.8.0\CMSIS\RTOS2\RTX\RTX5.scvd</Filename>
         <Type>ARM.CMSIS.5.8.0</Type>
         <SubType>1</SubType>
       </ScvdPack>
       <ScvdPack>
-        <Filename>C:\ARM\PACK\Keil\ARM_Compiler\1.6.3\EventRecorder.scvd</Filename>
+        <Filename>C:\Packs\Keil\ARM_Compiler\1.6.3\EventRecorder.scvd</Filename>
         <Type>Keil.ARM_Compiler.1.6.3</Type>
         <SubType>1</SubType>
       </ScvdPack>
@@ -270,7 +270,7 @@
       <OPTFL>
         <tvExp>1</tvExp>
         <tvExpOptDlg>0</tvExpOptDlg>
-        <IsCurrentTarget>0</IsCurrentTarget>
+        <IsCurrentTarget>1</IsCurrentTarget>
       </OPTFL>
       <CpuCode>7</CpuCode>
       <DebugOpt>
@@ -350,12 +350,12 @@
       </TargetDriverDllRegistry>
       <Breakpoint/>
       <ScvdPack>
-        <Filename>C:\ARM\PACK\ARM\CMSIS\5.8.0\CMSIS\RTOS2\RTX\RTX5.scvd</Filename>
+        <Filename>C:\Packs\ARM\CMSIS\5.8.0\CMSIS\RTOS2\RTX\RTX5.scvd</Filename>
         <Type>ARM.CMSIS.5.8.0</Type>
         <SubType>1</SubType>
       </ScvdPack>
       <ScvdPack>
-        <Filename>C:\ARM\PACK\Keil\ARM_Compiler\1.6.3\EventRecorder.scvd</Filename>
+        <Filename>C:\Packs\Keil\ARM_Compiler\1.6.3\EventRecorder.scvd</Filename>
         <Type>Keil.ARM_Compiler.1.6.3</Type>
         <SubType>1</SubType>
       </ScvdPack>
@@ -870,7 +870,7 @@
 
   <Group>
     <GroupName>Driver</GroupName>
-    <tvExp>0</tvExp>
+    <tvExp>1</tvExp>
     <tvExpOptDlg>0</tvExpOptDlg>
     <cbSel>0</cbSel>
     <RteFlg>0</RteFlg>
@@ -890,7 +890,7 @@
 
   <Group>
     <GroupName>TF_micro_frontend</GroupName>
-    <tvExp>0</tvExp>
+    <tvExp>1</tvExp>
     <tvExpOptDlg>0</tvExpOptDlg>
     <cbSel>0</cbSel>
     <RteFlg>0</RteFlg>
diff --git a/Platform_FVP_Corstone_SSE-300_Ethos-U55/microspeech.uvprojx b/Platform_FVP_Corstone_SSE-300_Ethos-U55/microspeech.uvprojx
index a15f5ea..601acac 100644
--- a/Platform_FVP_Corstone_SSE-300_Ethos-U55/microspeech.uvprojx
+++ b/Platform_FVP_Corstone_SSE-300_Ethos-U55/microspeech.uvprojx
@@ -313,7 +313,7 @@
           </ArmAdsMisc>
           <Cads>
             <interw>1</interw>
-            <Optim>6</Optim>
+            <Optim>7</Optim>
             <oTime>0</oTime>
             <SplitLS>0</SplitLS>
             <OneElfS>1</OneElfS>
@@ -4230,8 +4230,8 @@
       </file>
       <file attr="config" category="sourceCpp" name="tensorflow\lite\micro\cortex_m_generic\debug_log.cc" version="1.0">
         <instance index="0">RTE\Machine_Learning\debug_log.cc</instance>
-        <component Cclass="Machine Learning" Cgroup="TensorFlow" Csub="Kernel Utils" Cvendor="tensorflow" Cversion="0.2.20210719"/>
-        <package name="tensorflow-lite-micro" schemaVersion="1.6" url="https://github.com/MDK-Packs/Pack/raw/master/TensorFlow-Pack/" vendor="tensorflow" version="0.2.20210719"/>
+        <component Cclass="Machine Learning" Cgroup="TensorFlow" Csub="Kernel Utils" Cvendor="tensorflow" Cversion="0.4.0"/>
+        <package name="tensorflow-lite-micro" schemaVersion="1.6" url="https://github.com/MDK-Packs/tensorflow-pack/releases/download/0.4/" vendor="tensorflow" version="0.4.0"/>
         <targetInfos>
           <targetInfo name="Audio Provider Mock"/>
           <targetInfo name="Audio Provider Mock Test"/>
@@ -4241,8 +4241,8 @@
       </file>
       <file attr="config" category="sourceCpp" name="tensorflow\lite\micro\cortex_m_generic\micro_time.cc" version="1.0">
         <instance index="0">RTE\Machine_Learning\micro_time.cc</instance>
-        <component Cclass="Machine Learning" Cgroup="TensorFlow" Csub="Kernel Utils" Cvendor="tensorflow" Cversion="0.2.20210719"/>
-        <package name="tensorflow-lite-micro" schemaVersion="1.6" url="https://github.com/MDK-Packs/Pack/raw/master/TensorFlow-Pack/" vendor="tensorflow" version="0.2.20210719"/>
+        <component Cclass="Machine Learning" Cgroup="TensorFlow" Csub="Kernel Utils" Cvendor="tensorflow" Cversion="0.4.0"/>
+        <package name="tensorflow-lite-micro" schemaVersion="1.6" url="https://github.com/MDK-Packs/tensorflow-pack/releases/download/0.4/" vendor="tensorflow" version="0.4.0"/>
         <targetInfos>
           <targetInfo name="Audio Provider Mock"/>
           <targetInfo name="Audio Provider Mock Test"/>
@@ -4252,8 +4252,8 @@
       </file>
       <file attr="config" category="sourceCpp" name="tensorflow\lite\micro\system_setup.cc" version="1.0">
         <instance index="0">RTE\Machine_Learning\system_setup.cc</instance>
-        <component Cclass="Machine Learning" Cgroup="TensorFlow" Csub="Kernel Utils" Cvendor="tensorflow" Cversion="0.2.20210719"/>
-        <package name="tensorflow-lite-micro" schemaVersion="1.6" url="https://github.com/MDK-Packs/Pack/raw/master/TensorFlow-Pack/" vendor="tensorflow" version="0.2.20210719"/>
+        <component Cclass="Machine Learning" Cgroup="TensorFlow" Csub="Kernel Utils" Cvendor="tensorflow" Cversion="0.4.0"/>
+        <package name="tensorflow-lite-micro" schemaVersion="1.6" url="https://github.com/MDK-Packs/tensorflow-pack/releases/download/0.4/" vendor="tensorflow" version="0.4.0"/>
         <targetInfos>
           <targetInfo name="Audio Provider Mock"/>
           <targetInfo name="Audio Provider Mock Test"/>
diff --git a/Platform_IMXRT1050-EVKB/microspeech.uvoptx b/Platform_IMXRT1050-EVKB/microspeech.uvoptx
index 43be1ae..7893a52 100644
--- a/Platform_IMXRT1050-EVKB/microspeech.uvoptx
+++ b/Platform_IMXRT1050-EVKB/microspeech.uvoptx
@@ -130,7 +130,7 @@
         <SetRegEntry>
           <Number>0</Number>
           <Key>CMSIS_AGDI</Key>
-          <Name>-X"CMSIS-DAP" -U0227000047784e45002a9004d7450041 -O1743 -S8 -C0 -P00000000 -N00("ARM CoreSight SW-DP") -D00(0BD11477) -L00(0) -TO65554 -TC600000000 -TT600000000 -TP20 -TDS8007 -TDT0 -TDC1F -TIEFFFFFFFF -TIP8 -FO15 -FD20000000 -FC8000 -FN1 -FF0MIMXRT105x_HYPER_256KB_SEC.FLM -FS060000000 -FL04000000 -FP0($$Device:MIMXRT1052DVL6B$arm\MIMXRT105x_HYPER_256KB_SEC.FLM)</Name>
+          <Name>-X"CMSIS-DAP" -U0227000047784e4500439004d917002b -O1743 -S8 -C0 -P00000000 -N00("ARM CoreSight SW-DP") -D00(0BD11477) -L00(0) -TO65554 -TC600000000 -TT600000000 -TP20 -TDS8007 -TDT0 -TDC1F -TIEFFFFFFFF -TIP8 -FO15 -FD20000000 -FC8000 -FN1 -FF0MIMXRT105x_HYPER_256KB_SEC.FLM -FS060000000 -FL04000000 -FP0($$Device:MIMXRT1052DVL6B$arm\MIMXRT105x_HYPER_256KB_SEC.FLM)</Name>
         </SetRegEntry>
         <SetRegEntry>
           <Number>0</Number>
@@ -160,17 +160,17 @@
       </TargetDriverDllRegistry>
       <Breakpoint/>
       <ScvdPack>
-        <Filename>C:\Keil_v5\ARM\PACK\Keil\ARM_Compiler\1.6.3\EventRecorder.scvd</Filename>
-        <Type>Keil.ARM_Compiler.1.6.3</Type>
+        <Filename>C:\Packs\ARM\CMSIS\5.8.0\CMSIS\RTOS2\RTX\RTX5.scvd</Filename>
+        <Type>ARM.CMSIS.5.8.0</Type>
         <SubType>1</SubType>
       </ScvdPack>
       <ScvdPack>
-        <Filename>C:\Keil_v5\ARM\PACK\ARM\CMSIS\5.8.0\CMSIS\RTOS2\RTX\RTX5.scvd</Filename>
-        <Type>ARM.CMSIS.5.8.0</Type>
+        <Filename>C:\Packs\Keil\ARM_Compiler\1.6.3\EventRecorder.scvd</Filename>
+        <Type>Keil.ARM_Compiler.1.6.3</Type>
         <SubType>1</SubType>
       </ScvdPack>
       <ScvdPack>
-        <Filename>C:\Keil_v5\ARM\PACK\ARM\CMSIS\5.8.0\CMSIS\Driver\VIO\cmsis_vio.scvd</Filename>
+        <Filename>C:\Packs\ARM\CMSIS\5.8.0\CMSIS\Driver\VIO\cmsis_vio.scvd</Filename>
         <Type>ARM.CMSIS.5.8.0</Type>
         <SubType>1</SubType>
       </ScvdPack>
@@ -228,7 +228,7 @@
 
   <Group>
     <GroupName>App</GroupName>
-    <tvExp>0</tvExp>
+    <tvExp>1</tvExp>
     <tvExpOptDlg>0</tvExpOptDlg>
     <cbSel>0</cbSel>
     <RteFlg>0</RteFlg>
@@ -248,7 +248,7 @@
 
   <Group>
     <GroupName>Board</GroupName>
-    <tvExp>0</tvExp>
+    <tvExp>1</tvExp>
     <tvExpOptDlg>0</tvExpOptDlg>
     <cbSel>0</cbSel>
     <RteFlg>0</RteFlg>
@@ -280,7 +280,7 @@
 
   <Group>
     <GroupName>Board IO</GroupName>
-    <tvExp>0</tvExp>
+    <tvExp>1</tvExp>
     <tvExpOptDlg>0</tvExpOptDlg>
     <cbSel>0</cbSel>
     <RteFlg>0</RteFlg>
@@ -300,7 +300,7 @@
 
   <Group>
     <GroupName>Driver</GroupName>
-    <tvExp>0</tvExp>
+    <tvExp>1</tvExp>
     <tvExpOptDlg>0</tvExpOptDlg>
     <cbSel>0</cbSel>
     <RteFlg>0</RteFlg>
@@ -320,7 +320,7 @@
 
   <Group>
     <GroupName>MCUXpresso</GroupName>
-    <tvExp>0</tvExp>
+    <tvExp>1</tvExp>
     <tvExpOptDlg>0</tvExpOptDlg>
     <cbSel>0</cbSel>
     <RteFlg>0</RteFlg>
@@ -340,7 +340,7 @@
 
   <Group>
     <GroupName>Documentation</GroupName>
-    <tvExp>0</tvExp>
+    <tvExp>1</tvExp>
     <tvExpOptDlg>0</tvExpOptDlg>
     <cbSel>0</cbSel>
     <RteFlg>0</RteFlg>
@@ -360,7 +360,7 @@
 
   <Group>
     <GroupName>TF_micro_frontend</GroupName>
-    <tvExp>0</tvExp>
+    <tvExp>1</tvExp>
     <tvExpOptDlg>0</tvExpOptDlg>
     <cbSel>0</cbSel>
     <RteFlg>0</RteFlg>
@@ -736,7 +736,7 @@
 
   <Group>
     <GroupName>::Data Processing</GroupName>
-    <tvExp>0</tvExp>
+    <tvExp>1</tvExp>
     <tvExpOptDlg>0</tvExpOptDlg>
     <cbSel>0</cbSel>
     <RteFlg>1</RteFlg>
diff --git a/Platform_IMXRT1050-EVKB/microspeech.uvprojx b/Platform_IMXRT1050-EVKB/microspeech.uvprojx
index 3228c42..a2b313c 100644
--- a/Platform_IMXRT1050-EVKB/microspeech.uvprojx
+++ b/Platform_IMXRT1050-EVKB/microspeech.uvprojx
@@ -329,7 +329,7 @@
             <uGnu>0</uGnu>
             <useXO>0</useXO>
             <v6Lang>3</v6Lang>
-            <v6LangP>3</v6LangP>
+            <v6LangP>6</v6LangP>
             <vShortEn>1</vShortEn>
             <vShortWch>1</vShortWch>
             <v6Lto>0</v6Lto>
@@ -709,29 +709,29 @@
           <targetInfo name="IMXRT1050-EVKB" versionMatchMode="fixed"/>
         </targetInfos>
       </package>
-      <package name="flatbuffers" schemaVersion="1.6" url="https://github.com/MDK-Packs/Pack/raw/master/flatbuffers/" vendor="tensorflow" version="0.1.20210719">
+      <package name="flatbuffers" schemaVersion="1.6" url="https://github.com/MDK-Packs/Pack/raw/master/flatbuffers/" vendor="tensorflow" version="0.4.0">
         <targetInfos>
-          <targetInfo name="IMXRT1050-EVKB"/>
+          <targetInfo name="IMXRT1050-EVKB" versionMatchMode="fixed"/>
         </targetInfos>
       </package>
-      <package name="gemmlowp" schemaVersion="1.6" url="https://github.com/MDK-Packs/Pack/raw/master/gemmlowp/" vendor="tensorflow" version="0.0.1.20210719">
+      <package name="gemmlowp" schemaVersion="1.6" url="https://github.com/MDK-Packs/Pack/raw/master/gemmlowp/" vendor="tensorflow" version="0.4.0">
         <targetInfos>
-          <targetInfo name="IMXRT1050-EVKB"/>
+          <targetInfo name="IMXRT1050-EVKB" versionMatchMode="fixed"/>
         </targetInfos>
       </package>
-      <package name="kissfft" schemaVersion="1.6" url="https://github.com/MDK-Packs/Pack/raw/master/kissfft/" vendor="tensorflow" version="0.1.20210719">
+      <package name="kissfft" schemaVersion="1.6" url="https://github.com/MDK-Packs/Pack/raw/master/kissfft/" vendor="tensorflow" version="0.4.0">
         <targetInfos>
-          <targetInfo name="IMXRT1050-EVKB"/>
+          <targetInfo name="IMXRT1050-EVKB" versionMatchMode="fixed"/>
         </targetInfos>
       </package>
-      <package name="ruy" schemaVersion="1.6" url="https://github.com/MDK-Packs/Pack/raw/master/flatbuffers/" vendor="tensorflow" version="0.1.20210719">
+      <package name="ruy" schemaVersion="1.6" url="https://github.com/MDK-Packs/Pack/raw/master/flatbuffers/" vendor="tensorflow" version="0.4.0">
         <targetInfos>
-          <targetInfo name="IMXRT1050-EVKB"/>
+          <targetInfo name="IMXRT1050-EVKB" versionMatchMode="fixed"/>
         </targetInfos>
       </package>
-      <package name="tensorflow-lite-micro" schemaVersion="1.6" url="https://github.com/MDK-Packs/Pack/raw/master/TensorFlow-Pack/" vendor="tensorflow" version="0.2.20210719">
+      <package name="tensorflow-lite-micro" schemaVersion="1.6" url="https://github.com/MDK-Packs/Pack/raw/master/TensorFlow-Pack/" vendor="tensorflow" version="0.4.0">
         <targetInfos>
-          <targetInfo name="IMXRT1050-EVKB"/>
+          <targetInfo name="IMXRT1050-EVKB" versionMatchMode="fixed"/>
         </targetInfos>
       </package>
     </packages>
@@ -1071,37 +1071,41 @@
         </targetInfos>
       </component>
       <component Cclass="Data Exchange" Cgroup="Serialization" Csub="flatbuffers" Cvariant="tensorflow" Cvendor="tensorflow" Cversion="1.12.0">
-        <package name="flatbuffers" schemaVersion="1.6" url="https://github.com/MDK-Packs/Pack/raw/master/flatbuffers/" vendor="tensorflow" version="0.1.20210719"/>
+        <package name="flatbuffers" schemaVersion="1.6" url="https://github.com/MDK-Packs/Pack/raw/master/flatbuffers/" vendor="tensorflow" version="0.4.0"/>
         <targetInfos>
           <targetInfo name="IMXRT1050-EVKB"/>
         </targetInfos>
       </component>
       <component Cclass="Data Processing" Cgroup="Math" Csub="gemmlowp fixed-point" Cvariant="tensorflow" Cvendor="tensorflow" Cversion="1.0.0">
-        <package name="gemmlowp" schemaVersion="1.6" url="https://github.com/MDK-Packs/Pack/raw/master/gemmlowp/" vendor="tensorflow" version="0.0.1.20210719"/>
+        <package name="gemmlowp" schemaVersion="1.6" url="https://github.com/MDK-Packs/Pack/raw/master/gemmlowp/" vendor="tensorflow" version="0.4.0"/>
         <targetInfos>
           <targetInfo name="IMXRT1050-EVKB"/>
         </targetInfos>
       </component>
       <component Cclass="Data Processing" Cgroup="Math" Csub="kissfft" Cvariant="tensorflow" Cvendor="tensorflow" Cversion="1.4.5">
-        <package name="kissfft" schemaVersion="1.6" url="https://github.com/MDK-Packs/Pack/raw/master/kissfft/" vendor="tensorflow" version="0.1.20210719"/>
+        <package name="kissfft" schemaVersion="1.6" url="https://github.com/MDK-Packs/Pack/raw/master/kissfft/" vendor="tensorflow" version="0.4.0"/>
         <targetInfos>
-          <targetInfo name="IMXRT1050-EVKB"/>
+          <targetInfo name="IMXRT1050-EVKB">
+            <c>
+              <Optim>1</Optim>
+            </c>
+          </targetInfo>
         </targetInfos>
       </component>
       <component Cclass="Data Processing" Cgroup="Math" Csub="ruy" Cvariant="tensorflow" Cvendor="tensorflow" Cversion="1.12.0">
-        <package name="ruy" schemaVersion="1.6" url="https://github.com/MDK-Packs/Pack/raw/master/flatbuffers/" vendor="tensorflow" version="0.1.20210719"/>
+        <package name="ruy" schemaVersion="1.6" url="https://github.com/MDK-Packs/Pack/raw/master/flatbuffers/" vendor="tensorflow" version="0.4.0"/>
         <targetInfos>
           <targetInfo name="IMXRT1050-EVKB"/>
         </targetInfos>
       </component>
-      <component Cclass="Machine Learning" Cgroup="TensorFlow" Csub="Kernel Utils" Cvendor="tensorflow" Cversion="0.2.20210719">
-        <package name="tensorflow-lite-micro" schemaVersion="1.6" url="https://github.com/MDK-Packs/Pack/raw/master/TensorFlow-Pack/" vendor="tensorflow" version="0.2.20210719"/>
+      <component Cclass="Machine Learning" Cgroup="TensorFlow" Csub="Kernel Utils" Cvendor="tensorflow" Cversion="0.4.0">
+        <package name="tensorflow-lite-micro" schemaVersion="1.6" url="https://github.com/MDK-Packs/Pack/raw/master/TensorFlow-Pack/" vendor="tensorflow" version="0.4.0"/>
         <targetInfos>
           <targetInfo name="IMXRT1050-EVKB"/>
         </targetInfos>
       </component>
-      <component Cclass="Machine Learning" Cgroup="TensorFlow" Csub="Kernel" Cvariant="CMSIS-NN" Cvendor="tensorflow" Cversion="0.2.20210719" condition="CMSIS-NN">
-        <package name="tensorflow-lite-micro" schemaVersion="1.6" url="https://github.com/MDK-Packs/Pack/raw/master/TensorFlow-Pack/" vendor="tensorflow" version="0.2.20210719"/>
+      <component Cclass="Machine Learning" Cgroup="TensorFlow" Csub="Kernel" Cvariant="CMSIS-NN" Cvendor="tensorflow" Cversion="0.4.0" condition="CMSIS-NN">
+        <package name="tensorflow-lite-micro" schemaVersion="1.6" url="https://github.com/MDK-Packs/Pack/raw/master/TensorFlow-Pack/" vendor="tensorflow" version="0.4.0"/>
         <targetInfos>
           <targetInfo name="IMXRT1050-EVKB"/>
         </targetInfos>
@@ -1270,24 +1274,24 @@
       </file>
       <file attr="config" category="sourceCpp" name="tensorflow\lite\micro\cortex_m_generic\debug_log.cc" version="1.0">
         <instance index="0">RTE\Machine_Learning\debug_log.cc</instance>
-        <component Cclass="Machine Learning" Cgroup="TensorFlow" Csub="Kernel Utils" Cvendor="tensorflow" Cversion="0.2.20210719"/>
-        <package name="tensorflow-lite-micro" schemaVersion="1.6" url="https://github.com/MDK-Packs/Pack/raw/master/TensorFlow-Pack/" vendor="tensorflow" version="0.2.20210719"/>
+        <component Cclass="Machine Learning" Cgroup="TensorFlow" Csub="Kernel Utils" Cvendor="tensorflow" Cversion="0.4.0"/>
+        <package name="tensorflow-lite-micro" schemaVersion="1.6" url="https://github.com/MDK-Packs/Pack/raw/master/TensorFlow-Pack/" vendor="tensorflow" version="0.4.0"/>
         <targetInfos>
           <targetInfo name="IMXRT1050-EVKB"/>
         </targetInfos>
       </file>
       <file attr="config" category="sourceCpp" name="tensorflow\lite\micro\cortex_m_generic\micro_time.cc" version="1.0">
         <instance index="0">RTE\Machine_Learning\micro_time.cc</instance>
-        <component Cclass="Machine Learning" Cgroup="TensorFlow" Csub="Kernel Utils" Cvendor="tensorflow" Cversion="0.2.20210719"/>
-        <package name="tensorflow-lite-micro" schemaVersion="1.6" url="https://github.com/MDK-Packs/Pack/raw/master/TensorFlow-Pack/" vendor="tensorflow" version="0.2.20210719"/>
+        <component Cclass="Machine Learning" Cgroup="TensorFlow" Csub="Kernel Utils" Cvendor="tensorflow" Cversion="0.4.0"/>
+        <package name="tensorflow-lite-micro" schemaVersion="1.6" url="https://github.com/MDK-Packs/Pack/raw/master/TensorFlow-Pack/" vendor="tensorflow" version="0.4.0"/>
         <targetInfos>
           <targetInfo name="IMXRT1050-EVKB"/>
         </targetInfos>
       </file>
       <file attr="config" category="sourceCpp" name="tensorflow\lite\micro\system_setup.cc" version="1.0">
         <instance index="0">RTE\Machine_Learning\system_setup.cc</instance>
-        <component Cclass="Machine Learning" Cgroup="TensorFlow" Csub="Kernel Utils" Cvendor="tensorflow" Cversion="0.2.20210719"/>
-        <package name="tensorflow-lite-micro" schemaVersion="1.6" url="https://github.com/MDK-Packs/Pack/raw/master/TensorFlow-Pack/" vendor="tensorflow" version="0.2.20210719"/>
+        <component Cclass="Machine Learning" Cgroup="TensorFlow" Csub="Kernel Utils" Cvendor="tensorflow" Cversion="0.4.0"/>
+        <package name="tensorflow-lite-micro" schemaVersion="1.6" url="https://github.com/MDK-Packs/Pack/raw/master/TensorFlow-Pack/" vendor="tensorflow" version="0.4.0"/>
         <targetInfos>
           <targetInfo name="IMXRT1050-EVKB"/>
         </targetInfos>
diff --git a/Platform_MIMXRT1064-EVK/microspeech.uvoptx b/Platform_MIMXRT1064-EVK/microspeech.uvoptx
index e94fdef..9aa21ca 100644
--- a/Platform_MIMXRT1064-EVK/microspeech.uvoptx
+++ b/Platform_MIMXRT1064-EVK/microspeech.uvoptx
@@ -155,17 +155,17 @@
       </TargetDriverDllRegistry>
       <Breakpoint/>
       <ScvdPack>
-        <Filename>C:\ARM\PACK\ARM\CMSIS\5.8.0\CMSIS\Driver\VIO\cmsis_vio.scvd</Filename>
+        <Filename>C:\Packs\ARM\CMSIS\5.8.0\CMSIS\Driver\VIO\cmsis_vio.scvd</Filename>
         <Type>ARM.CMSIS.5.8.0</Type>
         <SubType>1</SubType>
       </ScvdPack>
       <ScvdPack>
-        <Filename>C:\ARM\PACK\ARM\CMSIS\5.8.0\CMSIS\RTOS2\RTX\RTX5.scvd</Filename>
+        <Filename>C:\Packs\ARM\CMSIS\5.8.0\CMSIS\RTOS2\RTX\RTX5.scvd</Filename>
         <Type>ARM.CMSIS.5.8.0</Type>
         <SubType>1</SubType>
       </ScvdPack>
       <ScvdPack>
-        <Filename>C:\ARM\PACK\Keil\ARM_Compiler\1.6.3\EventRecorder.scvd</Filename>
+        <Filename>C:\Packs\Keil\ARM_Compiler\1.6.3\EventRecorder.scvd</Filename>
         <Type>Keil.ARM_Compiler.1.6.3</Type>
         <SubType>1</SubType>
       </ScvdPack>
diff --git a/Platform_MIMXRT1064-EVK/microspeech.uvprojx b/Platform_MIMXRT1064-EVK/microspeech.uvprojx
index a957541..b3a75cc 100644
--- a/Platform_MIMXRT1064-EVK/microspeech.uvprojx
+++ b/Platform_MIMXRT1064-EVK/microspeech.uvprojx
@@ -1520,24 +1520,24 @@
       </file>
       <file attr="config" category="sourceCpp" name="tensorflow\lite\micro\cortex_m_generic\debug_log.cc" version="1.0">
         <instance index="0">RTE\Machine_Learning\debug_log.cc</instance>
-        <component Cclass="Machine Learning" Cgroup="TensorFlow" Csub="Kernel Utils" Cvendor="tensorflow" Cversion="0.2.20210719"/>
-        <package name="tensorflow-lite-micro" schemaVersion="1.6" url="https://github.com/MDK-Packs/Pack/raw/master/TensorFlow-Pack/" vendor="tensorflow" version="0.2.20210719"/>
+        <component Cclass="Machine Learning" Cgroup="TensorFlow" Csub="Kernel Utils" Cvendor="tensorflow" Cversion="0.4.0"/>
+        <package name="tensorflow-lite-micro" schemaVersion="1.6" url="https://github.com/MDK-Packs/Pack/raw/master/TensorFlow-Pack/" vendor="tensorflow" version="0.4.0"/>
         <targetInfos>
           <targetInfo name="MIMXRT1064-EVK"/>
         </targetInfos>
       </file>
       <file attr="config" category="sourceCpp" name="tensorflow\lite\micro\cortex_m_generic\micro_time.cc" version="1.0">
         <instance index="0">RTE\Machine_Learning\micro_time.cc</instance>
-        <component Cclass="Machine Learning" Cgroup="TensorFlow" Csub="Kernel Utils" Cvendor="tensorflow" Cversion="0.2.20210719"/>
-        <package name="tensorflow-lite-micro" schemaVersion="1.6" url="https://github.com/MDK-Packs/Pack/raw/master/TensorFlow-Pack/" vendor="tensorflow" version="0.2.20210719"/>
+        <component Cclass="Machine Learning" Cgroup="TensorFlow" Csub="Kernel Utils" Cvendor="tensorflow" Cversion="0.4.0"/>
+        <package name="tensorflow-lite-micro" schemaVersion="1.6" url="https://github.com/MDK-Packs/Pack/raw/master/TensorFlow-Pack/" vendor="tensorflow" version="0.4.0"/>
         <targetInfos>
           <targetInfo name="MIMXRT1064-EVK"/>
         </targetInfos>
       </file>
       <file attr="config" category="sourceCpp" name="tensorflow\lite\micro\system_setup.cc" version="1.0">
         <instance index="0">RTE\Machine_Learning\system_setup.cc</instance>
-        <component Cclass="Machine Learning" Cgroup="TensorFlow" Csub="Kernel Utils" Cvendor="tensorflow" Cversion="0.2.20210719"/>
-        <package name="tensorflow-lite-micro" schemaVersion="1.6" url="https://github.com/MDK-Packs/Pack/raw/master/TensorFlow-Pack/" vendor="tensorflow" version="0.2.20210719"/>
+        <component Cclass="Machine Learning" Cgroup="TensorFlow" Csub="Kernel Utils" Cvendor="tensorflow" Cversion="0.4.0"/>
+        <package name="tensorflow-lite-micro" schemaVersion="1.6" url="https://github.com/MDK-Packs/Pack/raw/master/TensorFlow-Pack/" vendor="tensorflow" version="0.4.0"/>
         <targetInfos>
           <targetInfo name="MIMXRT1064-EVK"/>
         </targetInfos>