aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoanna Farley <joanna.farley@arm.com>2023-11-06 17:55:20 +0100
committerTrustedFirmware Code Review <review@review.trustedfirmware.org>2023-11-06 17:55:20 +0100
commit1684c8d6a16c7463f9d4ca82920d659b9404f2e0 (patch)
treec80bce40c90a405a699162a057b3dc36875cc6bb
parent11a8a3e9358839ef28d1b40d83904d649fd4d51a (diff)
parent2243ba3c38ae5bab894709a4e98f188815398ef1 (diff)
downloadtrusted-firmware-a-1684c8d6a16c7463f9d4ca82920d659b9404f2e0.tar.gz
Merge changes from topic "enable_assertion" into integration
* changes: feat(zynqmp): enable assertion feat(versal-net): enable assertion feat(versal): enable assertion
-rw-r--r--plat/xilinx/versal/platform.mk3
-rw-r--r--plat/xilinx/versal_net/platform.mk3
-rw-r--r--plat/xilinx/zynqmp/platform.mk4
3 files changed, 10 insertions, 0 deletions
diff --git a/plat/xilinx/versal/platform.mk b/plat/xilinx/versal/platform.mk
index 494c30df3..7c53daadd 100644
--- a/plat/xilinx/versal/platform.mk
+++ b/plat/xilinx/versal/platform.mk
@@ -54,6 +54,9 @@ ifeq (${PLAT_XLAT_TABLES_DYNAMIC},1)
$(eval $(call add_define,PLAT_XLAT_TABLES_DYNAMIC))
endif
+# enable assert() for release/debug builds
+ENABLE_ASSERTIONS := 1
+
PLAT_INCLUDES := -Iinclude/plat/arm/common/ \
-Iplat/xilinx/common/include/ \
-Iplat/xilinx/common/ipi_mailbox_service/ \
diff --git a/plat/xilinx/versal_net/platform.mk b/plat/xilinx/versal_net/platform.mk
index fb229bb45..f29918904 100644
--- a/plat/xilinx/versal_net/platform.mk
+++ b/plat/xilinx/versal_net/platform.mk
@@ -69,6 +69,9 @@ ifdef XILINX_OF_BOARD_DTB_ADDR
$(eval $(call add_define,XILINX_OF_BOARD_DTB_ADDR))
endif
+# enable assert() for release/debug builds
+ENABLE_ASSERTIONS := 1
+
PLAT_INCLUDES := -Iinclude/plat/arm/common/ \
-Iplat/xilinx/common/include/ \
-Iplat/xilinx/common/ipi_mailbox_service/ \
diff --git a/plat/xilinx/zynqmp/platform.mk b/plat/xilinx/zynqmp/platform.mk
index b77893200..e266615fb 100644
--- a/plat/xilinx/zynqmp/platform.mk
+++ b/plat/xilinx/zynqmp/platform.mk
@@ -49,6 +49,10 @@ ifdef ZYNQMP_ATF_MEM_BASE
ifdef ZYNQMP_ATF_MEM_PROGBITS_SIZE
$(eval $(call add_define,ZYNQMP_ATF_MEM_PROGBITS_SIZE))
endif
+
+ # enable assert() when TF-A runs from DDR memory.
+ ENABLE_ASSERTIONS := 1
+
endif
ifdef ZYNQMP_BL32_MEM_BASE