From 5578074c01e11bf58c08715e62dcbca3608d1f9f Mon Sep 17 00:00:00 2001
From: Joachim Krech <8290187+jkrech@users.noreply.github.com>
Date: Wed, 23 Sep 2026 14:37:31 +0200
Subject: [PATCH 1/2] Update SimpleTZ.csolution.yml

added missing secure image specification for Release set.
FVP does not have the secure firmware pre-programmed.
---
 SimpleTrustZone/SimpleTZ.csolution.yml | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/SimpleTrustZone/SimpleTZ.csolution.yml b/SimpleTrustZone/SimpleTZ.csolution.yml
index b1827a4..d99045c 100644
--- a/SimpleTrustZone/SimpleTZ.csolution.yml
+++ b/SimpleTrustZone/SimpleTZ.csolution.yml
@@ -40,9 +40,10 @@ solution:
       target-set:
         - set: Debug
           images:
+            - project-context: CM33_ns.Debug
+            # loading secure image as hex file into FVP Model
             - image: out/CM33_s/AVH/Debug/CM33_s.hex
               load: image
-            - project-context: CM33_ns.Debug
           debugger:
             name: Arm-FVP
             model: FVP_MPS2_Cortex-M33
@@ -51,6 +52,9 @@ solution:
         - set: Release
           images:
             - project-context: CM33_ns.Release
+            # loading secure image as hex file into FVP Model
+            - image: out/CM33_s/AVH/Release/CM33_s.hex
+              load: image
           debugger:
             name: Arm-FVP
             model: FVP_MPS2_Cortex-M33
@@ -70,5 +74,5 @@ solution:
       optimize: balanced
 
   projects:
-    - project: ./CM33_ns/CM33_ns.cproject.yml
     - project: ./CM33_s/CM33_s.cproject.yml
+    - project: ./CM33_ns/CM33_ns.cproject.yml

From 42c4df54fd4db284434bebb4f47cb85726f07197 Mon Sep 17 00:00:00 2001
From: Joachim Krech <8290187+jkrech@users.noreply.github.com>
Date: Wed, 23 Sep 2026 14:44:23 +0200
Subject: [PATCH 2/2] Add testing of AVH-NS-only target

---
 .github/workflows/SimpleTZ-CI.yml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/.github/workflows/SimpleTZ-CI.yml b/.github/workflows/SimpleTZ-CI.yml
index 0752b90..2a4899d 100644
--- a/.github/workflows/SimpleTZ-CI.yml
+++ b/.github/workflows/SimpleTZ-CI.yml
@@ -50,6 +50,9 @@ jobs:
         working-directory: ./SimpleTrustZone/
         run: cbuild SimpleTZ.csolution.yml --packs --active AVH@${{ matrix.build.type }} --toolchain ${{ matrix.compiler.name }}
 
+      - name: Build project CM33_ns for build-type ${{ matrix.build.type }} with ${{ matrix.compiler.name }}
+        working-directory: ./SimpleTrustZone/
+        run: cbuild SimpleTZ.csolution.yml --packs --active AVH-NS-only@${{ matrix.build.type }} --toolchain ${{ matrix.compiler.name }}
 
       - name: Execute project CM33_s and CM33_ns for build-type ${{ matrix.build.type }} with ${{ matrix.compiler.name }} using FVP_MPS2_Cortex-M33
         working-directory: ./SimpleTrustZone/