commit a8deec5c0b51719b1f268e4f106c3a095a387074
author Olivier Deprez <olivier.deprez@arm.com> Tue Feb 13 09:34:17 2024 +0100
committer TrustedFirmware Code Review <review@review.trustedfirmware.org> Tue Feb 13 09:34:17 2024 +0100
tree ba834cd8cd46a432215cc09f6fb8886fc196e8c4
parent a3ec1f1762236914d129dd8155d19b149b2c6570
parent 5d4936a7baed58a73cdf2a2a117e5d0501527237

Merge "fix: map ns buffer only if needed for SMMU tests"

spm/cactus/cactus_main.c

diff --git a/spm/cactus/cactus_main.c b/spm/cactus/cactus_main.c
index e0e2c88..b3f7451 100644
--- a/spm/cactus/cactus_main.c
+++ b/spm/cactus/cactus_main.c
@@ -115,8 +115,10 @@
 	/* scratch memory allocated to be used for running SMMU tests */
 	MAP_REGION_FLAT(PLAT_CACTUS_MEMCPY_BASE, PLAT_CACTUS_MEMCPY_RANGE,
 			MT_MEMORY | MT_RW),
+#if PLAT_fvp
 	MAP_REGION_FLAT(PLAT_CACTUS_NS_MEMCPY_BASE, PLAT_CACTUS_MEMCPY_RANGE,
 			MT_MEMORY | MT_RW | MT_NS),
+#endif
 	{0}
 };