From 2e9b53f51f532406a21fa6804162ca4f4b9177cf Mon Sep 17 00:00:00 2001
From: Daniel Brondani <daniel.brondani@arm.com>
Date: Mon, 14 Sep 2026 13:02:57 +0200
Subject: [PATCH] [projmgr] Define `ARM_DEVICE_TZ_DISABLED` when TrustZone is
 disabled

---
 tools/projmgr/src/ProjMgrWorker.cpp                           | 4 ++++
 .../ref/setup-test.AbsolutePath+TEST_TARGET.cbuild.yml        | 2 ++
 .../ref/setup-test.Build_GCC+TEST_TARGET.cbuild.yml           | 2 ++
 .../ref/trustzone.Debug+tz-disabled.cbuild.yml                | 2 ++
 4 files changed, 10 insertions(+)

diff --git a/tools/projmgr/src/ProjMgrWorker.cpp b/tools/projmgr/src/ProjMgrWorker.cpp
index 405b981c8..9c598fec0 100644
--- a/tools/projmgr/src/ProjMgrWorker.cpp
+++ b/tools/projmgr/src/ProjMgrWorker.cpp
@@ -4121,6 +4121,10 @@ bool ProjMgrWorker::ProcessContext(ContextItem& context, bool loadGenFiles, bool
     ret &= ProcessGpdsc(context);
     ret &= ProcessGeneratedLayers(context);
   }
+  // Add compiler define for TrustZone disabled
+  if (context.controls.processed.processor.trustzone == RteConstants::YAML_OFF) {
+    context.rteActiveTarget->InsertDefine("ARM_DEVICE_TZ_DISABLED");
+  }
   // Check regions header, generate it if needed
   if (!context.linker.regions.empty()) {
     CheckAndGenerateRegionsHeader(context);
diff --git a/tools/projmgr/test/data/TestProjectSetup/ref/setup-test.AbsolutePath+TEST_TARGET.cbuild.yml b/tools/projmgr/test/data/TestProjectSetup/ref/setup-test.AbsolutePath+TEST_TARGET.cbuild.yml
index 7d3fe884a..369009ea4 100644
--- a/tools/projmgr/test/data/TestProjectSetup/ref/setup-test.AbsolutePath+TEST_TARGET.cbuild.yml
+++ b/tools/projmgr/test/data/TestProjectSetup/ref/setup-test.AbsolutePath+TEST_TARGET.cbuild.yml
@@ -32,9 +32,11 @@ build:
     - SETUP_GCC
     - SETUP_COMMON
     - ARMCM0
+    - ARM_DEVICE_TZ_DISABLED
     - _RTE_
   define-asm:
     - ARMCM0
+    - ARM_DEVICE_TZ_DISABLED
     - _RTE_
   add-path:
     - ../data/TestProjectSetup/setup/GCC
diff --git a/tools/projmgr/test/data/TestProjectSetup/ref/setup-test.Build_GCC+TEST_TARGET.cbuild.yml b/tools/projmgr/test/data/TestProjectSetup/ref/setup-test.Build_GCC+TEST_TARGET.cbuild.yml
index 0fa8088c9..a56fa4c38 100644
--- a/tools/projmgr/test/data/TestProjectSetup/ref/setup-test.Build_GCC+TEST_TARGET.cbuild.yml
+++ b/tools/projmgr/test/data/TestProjectSetup/ref/setup-test.Build_GCC+TEST_TARGET.cbuild.yml
@@ -32,9 +32,11 @@ build:
     - SETUP_GCC
     - SETUP_COMMON
     - ARMCM0
+    - ARM_DEVICE_TZ_DISABLED
     - _RTE_
   define-asm:
     - ARMCM0
+    - ARM_DEVICE_TZ_DISABLED
     - _RTE_
   add-path:
     - ../../../../../data/TestProjectSetup/setup/GCC
diff --git a/tools/projmgr/test/data/TestSolution/DeviceAttributes/ref/trustzone.Debug+tz-disabled.cbuild.yml b/tools/projmgr/test/data/TestSolution/DeviceAttributes/ref/trustzone.Debug+tz-disabled.cbuild.yml
index 649120a77..84ccd0bcb 100644
--- a/tools/projmgr/test/data/TestSolution/DeviceAttributes/ref/trustzone.Debug+tz-disabled.cbuild.yml
+++ b/tools/projmgr/test/data/TestSolution/DeviceAttributes/ref/trustzone.Debug+tz-disabled.cbuild.yml
@@ -21,9 +21,11 @@ build:
       path: ${CMSIS_PACK_ROOT}/ARM/RteTest_DFP/0.2.0
   define:
     - ARMCM0
+    - ARM_DEVICE_TZ_DISABLED
     - _RTE_
   define-asm:
     - ARMCM0
+    - ARM_DEVICE_TZ_DISABLED
     - _RTE_
   add-path:
     - ../data/TestSolution/DeviceAttributes/trustzone/RTE/_Debug_tz-disabled