diff options
| author | Dimitris Papastamos <dimitris.papastamos@arm.com> | 2018-05-29 09:28:05 +0100 |
|---|---|---|
| committer | Anson Huang <Anson.Huang@nxp.com> | 2018-06-21 13:29:21 +0800 |
| commit | 770f853dcb47ad856c060ffc6fefd626ae40e52c (patch) | |
| tree | 89e973cc90a4341ebdec51f4e26805fa1a81319e /bl31 | |
| parent | 959392911781f3bd4263a01d703097998d0aaa0f (diff) | |
Merge pull request #1392 from dp-arm/dp/cve_2018_3639
Implement workaround for CVE-2018-3639 on Cortex A57/A72/A73 and A75
Conflicts:
services/arm_arch_svc/arm_arch_svc_setup.c
Diffstat (limited to 'bl31')
| -rw-r--r-- | bl31/bl31.mk | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/bl31/bl31.mk b/bl31/bl31.mk index 0e47ddf6..a6c0a9a0 100644 --- a/bl31/bl31.mk +++ b/bl31/bl31.mk @@ -61,8 +61,8 @@ BL31_SOURCES += lib/extensions/sve/sve.c endif ifeq (${WORKAROUND_CVE_2017_5715},1) -BL31_SOURCES += lib/cpus/aarch64/workaround_cve_2017_5715_bpiall.S \ - lib/cpus/aarch64/workaround_cve_2017_5715_mmu.S +BL31_SOURCES += lib/cpus/aarch64/wa_cve_2017_5715_bpiall.S \ + lib/cpus/aarch64/wa_cve_2017_5715_mmu.S endif BL31_LINKERFILE := bl31/bl31.ld.S |