Commit 383c8089 authored by Dimitris Papastamos's avatar Dimitris Papastamos
Browse files

Disable workaround for CVE-2017-5715 on unaffected platforms



Change-Id: Ib67b841ab621ca1ace3280e44cf3e1d83052cb73
Signed-off-by: default avatarDimitris Papastamos <dimitris.papastamos@arm.com>
parent 1b56ed66
...@@ -122,4 +122,6 @@ ERRATA_A53_836870 := 1 ...@@ -122,4 +122,6 @@ ERRATA_A53_836870 := 1
ERRATA_A53_843419 := 1 ERRATA_A53_843419 := 1
ERRATA_A53_855873 := 1 ERRATA_A53_855873 := 1
WORKAROUND_CVE_2017_5715 := 0
FIP_ALIGN := 512 FIP_ALIGN := 512
...@@ -29,6 +29,8 @@ ERRATA_A53_835769 := 1 ...@@ -29,6 +29,8 @@ ERRATA_A53_835769 := 1
ERRATA_A53_843419 := 1 ERRATA_A53_843419 := 1
ENABLE_SVE_FOR_NS := 0 ENABLE_SVE_FOR_NS := 0
WORKAROUND_CVE_2017_5715 := 0
ARM_GIC_ARCH := 2 ARM_GIC_ARCH := 2
$(eval $(call add_define,ARM_GIC_ARCH)) $(eval $(call add_define,ARM_GIC_ARCH))
......
...@@ -61,6 +61,8 @@ $(eval $(call add_define,ARM_GIC_ARCH)) ...@@ -61,6 +61,8 @@ $(eval $(call add_define,ARM_GIC_ARCH))
ERRATA_A53_826319 := 1 ERRATA_A53_826319 := 1
ERRATA_A53_836870 := 1 ERRATA_A53_836870 := 1
WORKAROUND_CVE_2017_5715 := 0
# indicate the reset vector address can be programmed # indicate the reset vector address can be programmed
PROGRAMMABLE_RESET_ADDRESS := 1 PROGRAMMABLE_RESET_ADDRESS := 1
......
...@@ -58,3 +58,5 @@ $(eval $(call add_define,PLAT_SKIP_OPTEE_S_EL1_INT_REGISTER)) ...@@ -58,3 +58,5 @@ $(eval $(call add_define,PLAT_SKIP_OPTEE_S_EL1_INT_REGISTER))
# Do not enable SVE # Do not enable SVE
ENABLE_SVE_FOR_NS := 0 ENABLE_SVE_FOR_NS := 0
WORKAROUND_CVE_2017_5715 := 0
...@@ -57,3 +57,5 @@ $(eval $(call add_define,PLAT_EXTRA_LD_SCRIPT)) ...@@ -57,3 +57,5 @@ $(eval $(call add_define,PLAT_EXTRA_LD_SCRIPT))
# Do not enable SVE # Do not enable SVE
ENABLE_SVE_FOR_NS := 0 ENABLE_SVE_FOR_NS := 0
WORKAROUND_CVE_2017_5715 := 0
...@@ -64,6 +64,8 @@ ERRATA_A53_836870 := 1 ...@@ -64,6 +64,8 @@ ERRATA_A53_836870 := 1
ERRATA_A53_843419 := 1 ERRATA_A53_843419 := 1
ERRATA_A53_855873 := 1 ERRATA_A53_855873 := 1
WORKAROUND_CVE_2017_5715 := 0
# Disable the PSCI platform compatibility layer by default # Disable the PSCI platform compatibility layer by default
ENABLE_PLAT_COMPAT := 0 ENABLE_PLAT_COMPAT := 0
......
...@@ -14,6 +14,8 @@ override RESET_TO_BL31 := 1 ...@@ -14,6 +14,8 @@ override RESET_TO_BL31 := 1
# Do not enable SVE # Do not enable SVE
ENABLE_SVE_FOR_NS := 0 ENABLE_SVE_FOR_NS := 0
WORKAROUND_CVE_2017_5715 := 0
ifdef ZYNQMP_ATF_MEM_BASE ifdef ZYNQMP_ATF_MEM_BASE
$(eval $(call add_define,ZYNQMP_ATF_MEM_BASE)) $(eval $(call add_define,ZYNQMP_ATF_MEM_BASE))
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment