commit 0f5e0bb8eb54d0a16ec4efc7bdb40fa757038bf7
author Madhukar Pappireddy <madhukar.pappireddy@arm.com> Fri Dec 10 19:07:40 2021 +0100
committer TrustedFirmware Code Review <review@review.trustedfirmware.org> Fri Dec 10 19:07:40 2021 +0100
tree 3bf05add02014769f9a2699e90a9bddc7320bf0e
parent 683122efc0dc67d54700325e700d065a7b6c7d11
parent f9d518a6da528f1a511d42f2e10aa2ae5a5c96f8

Merge "feat(plat/zynqmp): disable the -mbranch-protection flag" into integration

plat/xilinx/zynqmp/platform.mk

diff --git a/plat/xilinx/zynqmp/platform.mk b/plat/xilinx/zynqmp/platform.mk
index d075a56..3d98584 100644
--- a/plat/xilinx/zynqmp/platform.mk
+++ b/plat/xilinx/zynqmp/platform.mk
@@ -118,6 +118,7 @@
 endif
 
 BL31_CPPFLAGS		+=	-fno-jump-tables
+TF_CFLAGS_aarch64	+=	-mbranch-protection=none
 
 ifneq (${RESET_TO_BL31},1)
   $(error "Using BL31 as the reset vector is only one option supported on ZynqMP. Please set RESET_TO_BL31 to 1.")