aboutsummaryrefslogtreecommitdiffstats
path: root/Makefile
diff options
context:
space:
mode:
authorSandrine Bailleux <sandrine.bailleux@arm.com>2021-01-26 14:58:00 +0000
committerTrustedFirmware Code Review <review@review.trustedfirmware.org>2021-01-26 14:58:00 +0000
commit1ddf38e853cd7cb3fa02678f310ee8aa4f13bb22 (patch)
treee1a96388bc99bb5f46236439b7dcbdeaeb2f9b3b /Makefile
parent036e9c177f8ac4ece205607fba98b0a16dc45703 (diff)
parent83683ddd3d704e2d8c1fe9bef9eabb4639c0846a (diff)
downloadplatform_external_arm-trusted-firmware-1ddf38e853cd7cb3fa02678f310ee8aa4f13bb22.tar.gz
platform_external_arm-trusted-firmware-1ddf38e853cd7cb3fa02678f310ee8aa4f13bb22.tar.bz2
platform_external_arm-trusted-firmware-1ddf38e853cd7cb3fa02678f310ee8aa4f13bb22.zip
Merge changes from topic "tp-feat-rng" into integration
* changes: plat/qemu: Use RNDR in stack protector Makefile: Add FEAT_RNG support define Define registers for FEAT_RNG support
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile5
1 files changed, 5 insertions, 0 deletions
diff --git a/Makefile b/Makefile
index ceb5a118c..1501f463d 100644
--- a/Makefile
+++ b/Makefile
@@ -242,6 +242,9 @@ endif
$(info Arm Architecture Features specified: $(subst +, ,$(arch-features)))
endif # arch-features
+# Determine if FEAT_RNG is supported
+ENABLE_FEAT_RNG = $(if $(findstring rng,${arch-features}),1,0)
+
ifneq ($(findstring armclang,$(notdir $(CC))),)
TF_CFLAGS_aarch32 = -target arm-arm-none-eabi $(march32-directive)
TF_CFLAGS_aarch64 = -target aarch64-arm-none-eabi $(march64-directive)
@@ -940,6 +943,7 @@ $(eval $(call assert_booleans,\
RAS_TRAP_LOWER_EL_ERR_ACCESS \
COT_DESC_IN_DTB \
USE_SP804_TIMER \
+ ENABLE_FEAT_RNG \
)))
$(eval $(call assert_numerics,\
@@ -1030,6 +1034,7 @@ $(eval $(call add_defines,\
RAS_TRAP_LOWER_EL_ERR_ACCESS \
COT_DESC_IN_DTB \
USE_SP804_TIMER \
+ ENABLE_FEAT_RNG \
)))
ifeq (${SANITIZE_UB},trap)