aboutsummaryrefslogtreecommitdiff
path: root/bl31/bl31.mk
diff options
context:
space:
mode:
authordavidcunado-arm <david.cunado@arm.com>2018-01-11 23:39:30 +0000
committerGitHub <noreply@github.com>2018-01-11 23:39:30 +0000
commit31dfea92048fa2a71495650d77f5c68ae582ab73 (patch)
tree57e1f13c49336a09491af8e18ec3b8a783f0c990 /bl31/bl31.mk
parentf10c0c459df55e3346c507b1b96d0304ec658d3a (diff)
parent780edd86a0b413c3620c5c42fd123a78b5b1587a (diff)
downloadtrusted-firmware-a-31dfea92048fa2a71495650d77f5c68ae582ab73.tar.gz
Merge pull request #1214 from dp-arm/dp/cve_2017_5715
Workarounds for CVE-2017-5715 on Cortex A57/A72/A73 and A75
Diffstat (limited to 'bl31/bl31.mk')
-rw-r--r--bl31/bl31.mk5
1 files changed, 5 insertions, 0 deletions
diff --git a/bl31/bl31.mk b/bl31/bl31.mk
index fdcc93139a..8ff8f89bb8 100644
--- a/bl31/bl31.mk
+++ b/bl31/bl31.mk
@@ -58,6 +58,11 @@ ifeq (${ENABLE_SVE_FOR_NS},1)
BL31_SOURCES += lib/extensions/sve/sve.c
endif
+ifeq (${WORKAROUND_CVE_2017_5715},1)
+BL31_SOURCES += lib/cpus/aarch64/workaround_cve_2017_5715_mmu.S \
+ lib/cpus/aarch64/workaround_cve_2017_5715_bpiall.S
+endif
+
BL31_LINKERFILE := bl31/bl31.ld.S
# Flag used to indicate if Crash reporting via console should be included