spcaipers-arm · spcaipers-arm · Oct 8, 2021
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -1,64 +1,93 @@
-# This is a basic workflow to help you get started with Actions
-
 name: CI
-
-# Controls when the workflow will run
 on:
-  # Triggers the workflow on push or pull request events but only for the main branch
-  #push:
-  #  branches: [ main ]
   pull_request:
     branches: [ main ]
-
-  # Allows you to run this workflow manually from the Actions tab
   workflow_dispatch:
-
-# A workflow run is made up of one or more jobs that can run sequentially or in parallel
+env:
+  CREATE_EC2_INSTANCE: true
+  EC2_INSTANCE_ID: ''
+  TERMINATE_EC2_INSTANCE: false
+  AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
+  AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
+  AWS_SESSION_TOKEN: ${{ secrets.AWS_SESSION_TOKEN }}
+  AWS_DEFAULT_REGION: eu-west-1
+  AWS_S3_BUCKET: gh-orta-vht
 jobs:
-  # This workflow contains a single job called "build"
   build:
-    # The type of runner that the job will run on
     runs-on: ubuntu-latest
-
-    # Steps represent a sequence of tasks that will be executed as part of the job
     steps:
-      # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
       - uses: actions/checkout@v2
 
-      #- name: Create Container runtime from DockerHub
-      #  run : |
-      #    docker run -i -v ${{ github.workspace }}:/workspace/host --mac-address="00:02:F7:FF:55:55" --name build_runtime -d armswdev/cmsis_tools_m55:latest
-      #    docker exec build_runtime pip3 install six requests pyyaml junit_xml pillow
+      - name: Create new EC2 instance
+        timeout-minutes: 2
+        if: ${{ env.CREATE_EC2_INSTANCE }}
+        run: |
+          instance_id=$(aws ec2 run-instances \
+                          --image-id ${{ secrets.AWS_AMI_ID }} \
+                          --count 1 \
+                          --instance-type t2.micro \
+                          --key-name common \
+                          --security-group-ids sg-0432ec5b74762b610 \
+                          --iam-instance-profile Name=Proj-s3-orta-vht-role \
+                          --subnet-id subnet-00455495b268076f0 \
+                          --output text \
+                          | awk '/INSTANCE/{print $9}')
+          echo "instance_id = $instance_id"
+          echo "EC2_INSTANCE_ID=$instance_id" >> $GITHUB_ENV
 
-      # Runs a set of commands using the runners shell
-      #- name: Build on Docker
-      #  run: |
-      #    docker exec build_runtime wget -N https://www.keil.com/pack/index.pidx -P /armtools/packs/.Web/
-      #    docker exec  -w /workspace/host/Platform_FVP_Corstone_SSE-300_Ethos-U55 build_runtime cbuild.sh /workspace/host/Platform_FVP_Corstone_SSE-300_Ethos-U55/microspeech.Example.cprj
+      - name: Wait for instance-status-ok
+        timeout-minutes: 10
+        if: ${{ env.CREATE_EC2_INSTANCE }}
+        run: |
+          aws ec2 wait instance-status-ok \
+            --instance-ids ${{ env.EC2_INSTANCE_ID }}
+
+      - name: Set EC2_INSTANCE_ID if not created and assigned
+        if: ${{ !env.CREATE_EC2_INSTANCE && env.EC2_INSTANCE_ID == '' }}
+        run: |
+          echo "EC2_INSTANCE_ID=${{ secrets.AWS_INSTANCE_ID }}" >> $GITHUB_ENV
 
       - name: Prepare Build on EC2 instance
         run: |
            cp -r ${{ github.workspace }}/Platform_FVP_Corstone_SSE-300_Ethos-U55/  ${{ github.workspace }}/vht/
+           cp -r ${{ github.workspace }}/micro_speech/ ${{ github.workspace }}/vht/
 
       - name: Prepare VHT Testsuite
         run: |
-           #cp ${{ github.workspace }}/Platform_FVP_Corstone_SSE-300_Ethos-U55/Objects/microspeech.axf ${{ github.workspace }}/vht/elf/
            cp -r ${{ github.workspace }}/VSI ${{ github.workspace }}/vht/VSI
            cp -r ${{ github.workspace }}/Platform_FVP_Corstone_SSE-300_Ethos-U55/fvp_config.txt ${{ github.workspace }}/vht/
 
-     # Run test suite in Arm VHT
+      # Run test suite in Arm VHT
+      # The EC2 instance needs a IAM Role allowing it to read/write S3 buckets.
+      # TODO: I need to give the policy for it
       - uses: spcaipers-arm/VHT-AMI@use_s3_bucket
         with:
           vht_in: ./vht/
-          instance_id: ${{ secrets.AWS_INSTANCE_ID }}
+          instance_id: ${{ env.EC2_INSTANCE_ID }}
+          aws_region: ${{ env. AWS_DEFAULT_REGION }}
+          s3_bucket_name: ${{ env.AWS_S3_BUCKET }}
           access_key_id: ${{ secrets.AWS_ACCESS_KEY_ID }}
-          secret_key_id: ${{ secrets.AWS_SECRET_KEY }}
+          secret_access_key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
+          session_token: ${{ secrets.AWS_SESSION_TOKEN }}
+      - name: Archive out.tar
+        uses: actions/upload-artifact@v2
+        with:
+          name: out.tar
+          path: out.tar
 
-      #- name: Setup tmate session
-      #  uses: mxschmitt/action-tmate@v3
+      - name: Untar results from VHT Testsuite
+        run: |
+           tar xvzf out.tar
+           cat home/ubuntu/vhtwork/out/microspeech.axf.stdio
+
+      - name: Archive microspeech.axf.stdio
+        uses: actions/upload-artifact@v2
+        with:
+          name: microspeech.axf.stdio
+          path: home/ubuntu/vhtwork/out/microspeech.axf.stdio
 
-      - name: Fetch results from VHT Testsuite
+      - name: Terminate EC2 Instance
+        if: ${{ env.TERMINATE_EC2_INSTANCE && always() }}
         run: |
-           tar tvf  ${{ github.workspace }}/vht/out.tar
-           tar xvzf  ${{ github.workspace }}/vht/out.tar
-           cat ./home/ubuntu/vhtwork/out/microspeech.axf.stdio
+          aws ec2 terminate-instances \
+            --instance-ids ${{ env.EC2_INSTANCE_ID }}
diff --git a/Platform_FVP_Corstone_SSE-300_Ethos-U55/RTE/Device/SSE-300-MPS3/region_limits.h b/Platform_FVP_Corstone_SSE-300_Ethos-U55/RTE/Device/SSE-300-MPS3/region_limits.h
@@ -28,20 +28,20 @@
 
 /* Secure Code */
 #define S_ROM_ALIAS               (0x10000000) /* ITCM_BASE_S */
-#define TOTAL_S_ROM_SIZE          (0x00040000) /* 256 kB */
+#define TOTAL_S_ROM_SIZE          (0x00100000) /* 1 MB */
 
 /* Secure Data */
 #define S_RAM_ALIAS               (0x30000000) /* DTCM_BASE_S */
-#define TOTAL_S_RAM_SIZE          (0x00040000) /* 256 kB */
+#define TOTAL_S_RAM_SIZE          (0x00400000) /* 4 MB */
 
 
 /* Non-Secure Code */
 #define NS_ROM_ALIAS              (0x01000000) /* SRAM_BASE_NS */
-#define TOTAL_NS_ROM_SIZE         (0x00040000) /* 256 kB */
+#define TOTAL_NS_ROM_SIZE         (0x00200000) /* 2 MB */
 
 /* Non-Secure Data */
 #define NS_RAM_ALIAS              (0x21000000) /* ISRAM0_BASE_NS */
-#define TOTAL_NS_RAM_SIZE         (0x00040000) /* 256 kB */
+#define TOTAL_NS_RAM_SIZE         (0x00080000) /* 512 kB */
 
 
 /* Heap and Stack sizes for secure and nonsecure applications */

diff --git a/Platform_FVP_Corstone_SSE-300_Ethos-U55/microspeech.Audio_Provider_Mock.cprj b/Platform_FVP_Corstone_SSE-300_Ethos-U55/microspeech.Audio_Provider_Mock.cprj
@@ -1,7 +1,7 @@
 <?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-09-06T09:53:42" tool="uVision V5.35.0.0"/>
+  <created timestamp="2021-10-06T16:08:07" tool="uVision V5.35.0.0"/>
 
   <info>
     <name>Blinky</name>
@@ -26,8 +26,8 @@
   <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"/>
+    <cflags add="-Oz -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="-Oz -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>../micro_speech/src</includes>
     <defines/>

diff --git a/...Ethos-U55/microspeech.Example.Helium.cprj → ...microspeech.Audio_Provider_Mock_Test.cprj b/...Ethos-U55/microspeech.Example.Helium.cprj → ...microspeech.Audio_Provider_Mock_Test.cprj
@@ -1,7 +1,7 @@
 <?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-09-06T09:47:49" tool="uVision V5.35.0.0"/>
+  <created timestamp="2021-10-06T16:08:21" tool="uVision V5.35.0.0"/>
 
   <info>
     <name>Blinky</name>
@@ -23,14 +23,14 @@
     <compiler name="AC6" version="6.0.0:6.99.99"/>
   </compilers>
 
-  <target Ddsp="DSP" Dendian="Little-endian" Dfpu="SP_FPU" Dmve="MVE" Dname="SSE-300-MPS3" Dsecure="TZ-disabled" Dtz="TZ" Dvendor="ARM:82">
+  <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 --lto" compiler="AC6" file="./RTE/Device/SSE-300-MPS3/fvp_sse300_mps3_s.sct"/>
-    <cflags add="-Ofast -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 -flto" compiler="AC6"/>
-    <cxxflags add="-Ofast -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++ -flto" compiler="AC6"/>
+    <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</defines>
+    <includes>../micro_speech/src</includes>
+    <defines>__TEST</defines>
   </target>
 
   <components>
@@ -84,19 +84,12 @@
   </components>
 
   <files>
-    <group name="App">
-      <file category="sourceC" name="./microspeech.c"/>
-    </group>
     <group name="Board">
-      <file category="sourceC" name="./main.c"/>
       <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"/>
@@ -122,12 +115,16 @@
       <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/main_functions.cc"/>
       <file category="sourceCpp" name="../micro_speech/src/recognize_commands.cc"/>
     </group>
+    <group name="TF_test">
+      <file category="sourceCpp" name="../micro_speech/src/audio_provider_mock.cc"/>
+      <file category="sourceCpp" name="../micro_speech/src/audio_provider_mock_test.cc"/>
+      <file category="sourceCpp" name="../micro_speech/src/yes_1000ms_sample_data.cc"/>
+      <file category="sourceCpp" name="../micro_speech/src/no_1000ms_sample_data.cc"/>
+    </group>
   </files>
 
 </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
@@ -1,7 +1,7 @@
 <?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"/>
+  <created timestamp="2021-10-06T15:58:11" tool="uVision V5.35.0.0"/>
 
   <info>
     <name>Blinky</name>
@@ -26,8 +26,8 @@
   <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"/>
+    <cflags add="-Oz -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="-Oz -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>

diff --git 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>0</IsCurrentTarget>
+        <IsCurrentTarget>1</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\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>
+          <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>
         </SetRegEntry>
         <SetRegEntry>
           <Number>0</Number>
@@ -155,12 +155,12 @@
       </TargetDriverDllRegistry>
       <Breakpoint/>
       <ScvdPack>
-        <Filename>C:\Packs\ARM\CMSIS\5.8.0\CMSIS\RTOS2\RTX\RTX5.scvd</Filename>
+        <Filename>C:\ARM\PACK\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:\Packs\Keil\ARM_Compiler\1.6.3\EventRecorder.scvd</Filename>
+        <Filename>C:\ARM\PACK\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>1</IsCurrentTarget>
+        <IsCurrentTarget>0</IsCurrentTarget>
       </OPTFL>
       <CpuCode>7</CpuCode>
       <DebugOpt>
@@ -350,12 +350,12 @@
       </TargetDriverDllRegistry>
       <Breakpoint/>
       <ScvdPack>
-        <Filename>C:\Packs\ARM\CMSIS\5.8.0\CMSIS\RTOS2\RTX\RTX5.scvd</Filename>
+        <Filename>C:\ARM\PACK\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:\Packs\Keil\ARM_Compiler\1.6.3\EventRecorder.scvd</Filename>
+        <Filename>C:\ARM\PACK\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>1</tvExp>
+    <tvExp>0</tvExp>
     <tvExpOptDlg>0</tvExpOptDlg>
     <cbSel>0</cbSel>
     <RteFlg>0</RteFlg>
@@ -890,7 +890,7 @@
 
   <Group>
     <GroupName>TF_micro_frontend</GroupName>
-    <tvExp>1</tvExp>
+    <tvExp>0</tvExp>
     <tvExpOptDlg>0</tvExpOptDlg>
     <cbSel>0</cbSel>
     <RteFlg>0</RteFlg>