Skip to content

[projmgr] Define ARM_DEVICE_TZ_DISABLED when trustzone is disabled #2606

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
brondani merged 1 commit into from
Sep 15, 2026
Merged

[projmgr] Define ARM_DEVICE_TZ_DISABLED when trustzone is disabled #2606

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions tools/projmgr/src/ProjMgrWorker.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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");
Comment thread
brondani marked this conversation as resolved.
}
// Check regions header, generate it if needed
if (!context.linker.regions.empty()) {
CheckAndGenerateRegionsHeader(context);
Expand Down
2 changes: 2 additions & 0 deletions tools/projmgr/test/data/TestProjectSetup/ref/setup-test.AbsolutePath+TEST_TARGET.cbuild.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 2 additions & 0 deletions tools/projmgr/test/data/TestProjectSetup/ref/setup-test.Build_GCC+TEST_TARGET.cbuild.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 2 additions & 0 deletions ...rojmgr/test/data/TestSolution/DeviceAttributes/ref/trustzone.Debug+tz-disabled.cbuild.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Loading