aboutsummaryrefslogtreecommitdiff
path: root/fwu
diff options
context:
space:
mode:
authorAlexei Fedorov <Alexei.Fedorov@arm.com>2020-06-19 14:25:43 +0100
committerAlexei Fedorov <Alexei.Fedorov@arm.com>2020-08-18 14:52:49 +0000
commit7fac162cd9439783ef60aaf266d22ad454445ace (patch)
tree0696ee3d15d1e4fcdfe3f1172f0c2c3dddc06ada /fwu
parentd6fdb6b10147038d99643a7547821c3cff76ce76 (diff)
downloadtf-a-tests-7fac162cd9439783ef60aaf266d22ad454445ace.tar.gz
TFTF: Add ARMv8.5 BTI support in makefiles
This patch adds 'BRANCH_PROTECTION' build option in TFTF makefiles which corresponds to that in TF-A. The option values are documented in 'build-options.rst' Signed-off-by: Alexei Fedorov <Alexei.Fedorov@arm.com> Change-Id: Iad5083aee339cec574acf5e7ab1fd8142877a122
Diffstat (limited to 'fwu')
-rw-r--r--fwu/ns_bl1u/ns_bl1u.mk6
-rw-r--r--fwu/ns_bl2u/ns_bl2u.mk6
2 files changed, 6 insertions, 6 deletions
diff --git a/fwu/ns_bl1u/ns_bl1u.mk b/fwu/ns_bl1u/ns_bl1u.mk
index 7e0e7679..2b45b8d9 100644
--- a/fwu/ns_bl1u/ns_bl1u.mk
+++ b/fwu/ns_bl1u/ns_bl1u.mk
@@ -4,6 +4,7 @@
# SPDX-License-Identifier: BSD-3-Clause
#
+include branch_protection.mk
include lib/xlat_tables_v2/xlat_tables.mk
include lib/compiler-rt/compiler-rt.mk
@@ -67,9 +68,8 @@ $(eval $(call add_define,NS_BL1U_DEFINES,ARM_ARCH_MAJOR))
$(eval $(call add_define,NS_BL1U_DEFINES,ARM_ARCH_MINOR))
$(eval $(call add_define,NS_BL1U_DEFINES,DEBUG))
$(eval $(call add_define,NS_BL1U_DEFINES,ENABLE_ASSERTIONS))
+$(eval $(call add_define,NS_BL1U_DEFINES,ENABLE_BTI))
+$(eval $(call add_define,NS_BL1U_DEFINES,ENABLE_PAUTH))
$(eval $(call add_define,NS_BL1U_DEFINES,FWU_BL_TEST))
$(eval $(call add_define,NS_BL1U_DEFINES,LOG_LEVEL))
$(eval $(call add_define,NS_BL1U_DEFINES,PLAT_${PLAT}))
-ifeq (${ARCH},aarch64)
- $(eval $(call add_define,NS_BL1U_DEFINES,ENABLE_PAUTH))
-endif
diff --git a/fwu/ns_bl2u/ns_bl2u.mk b/fwu/ns_bl2u/ns_bl2u.mk
index b6e616e8..0864313a 100644
--- a/fwu/ns_bl2u/ns_bl2u.mk
+++ b/fwu/ns_bl2u/ns_bl2u.mk
@@ -4,6 +4,7 @@
# SPDX-License-Identifier: BSD-3-Clause
#
+include branch_protection.mk
include lib/xlat_tables_v2/xlat_tables.mk
include lib/compiler-rt/compiler-rt.mk
@@ -62,9 +63,8 @@ $(eval $(call add_define,NS_BL2U_DEFINES,ARM_ARCH_MAJOR))
$(eval $(call add_define,NS_BL2U_DEFINES,ARM_ARCH_MINOR))
$(eval $(call add_define,NS_BL2U_DEFINES,DEBUG))
$(eval $(call add_define,NS_BL2U_DEFINES,ENABLE_ASSERTIONS))
+$(eval $(call add_define,NS_BL2U_DEFINES,ENABLE_BTI))
+$(eval $(call add_define,NS_BL2U_DEFINES,ENABLE_PAUTH))
$(eval $(call add_define,NS_BL2U_DEFINES,FWU_BL_TEST))
$(eval $(call add_define,NS_BL2U_DEFINES,LOG_LEVEL))
$(eval $(call add_define,NS_BL2U_DEFINES,PLAT_${PLAT}))
-ifeq (${ARCH},aarch64)
- $(eval $(call add_define,NS_BL2U_DEFINES,ENABLE_PAUTH))
-endif