diff options
| author | Dimitris Papastamos <dimitris.papastamos@arm.com> | 2018-01-24 16:41:14 +0000 |
|---|---|---|
| committer | Kostya Porotchkin <kostap@marvell.com> | 2018-04-16 14:05:55 +0300 |
| commit | 56b415ddf910476b91ce8675f91c4c87b0536e8e (patch) | |
| tree | 5bdbe9cda46246465bfce96f68262d6368df25bc | |
| parent | 86da4e5ab92fb9e68d57c54cc082b830835cc7c2 (diff) | |
Disable workaround for CVE-2017-5715 on unaffected platforms
Change-Id: Ib67b841ab621ca1ace3280e44cf3e1d83052cb73
Signed-off-by: Dimitris Papastamos <dimitris.papastamos@arm.com>
Reviewed-on: http://vgitil04.il.marvell.com:8080/53231
Tested-by: iSoC Platform CI <ykjenk@marvell.com>
Reviewed-by: Kostya Porotchkin <kostap@marvell.com>
| -rw-r--r-- | plat/hisilicon/hikey/platform.mk | 1 | ||||
| -rw-r--r-- | plat/mediatek/mt6795/platform.mk | 2 | ||||
| -rw-r--r-- | plat/rockchip/rk3328/platform.mk | 2 | ||||
| -rw-r--r-- | plat/rockchip/rk3368/platform.mk | 2 | ||||
| -rw-r--r-- | plat/xilinx/zynqmp/platform.mk | 2 |
5 files changed, 9 insertions, 0 deletions
diff --git a/plat/hisilicon/hikey/platform.mk b/plat/hisilicon/hikey/platform.mk index 85dc40d1..d707f170 100644 --- a/plat/hisilicon/hikey/platform.mk +++ b/plat/hisilicon/hikey/platform.mk @@ -82,3 +82,4 @@ BL31_SOURCES += plat/hisilicon/hikey/hisi_sip_svc.c \ lib/pmf/pmf_smc.c endif +WORKAROUND_CVE_2017_5715 := 0 diff --git a/plat/mediatek/mt6795/platform.mk b/plat/mediatek/mt6795/platform.mk index 4ebc78e5..c24cddf2 100644 --- a/plat/mediatek/mt6795/platform.mk +++ b/plat/mediatek/mt6795/platform.mk @@ -61,6 +61,8 @@ $(eval $(call add_define,ARM_GIC_ARCH)) ERRATA_A53_826319 := 1 ERRATA_A53_836870 := 1 +WORKAROUND_CVE_2017_5715 := 0 + # indicate the reset vector address can be programmed PROGRAMMABLE_RESET_ADDRESS := 1 diff --git a/plat/rockchip/rk3328/platform.mk b/plat/rockchip/rk3328/platform.mk index 8863fb4f..244599c4 100644 --- a/plat/rockchip/rk3328/platform.mk +++ b/plat/rockchip/rk3328/platform.mk @@ -52,3 +52,5 @@ ENABLE_PLAT_COMPAT := 0 $(eval $(call add_define,PLAT_EXTRA_LD_SCRIPT)) $(eval $(call add_define,PLAT_SKIP_OPTEE_S_EL1_INT_REGISTER)) + +WORKAROUND_CVE_2017_5715 := 0 diff --git a/plat/rockchip/rk3368/platform.mk b/plat/rockchip/rk3368/platform.mk index f6960cf4..687b9795 100644 --- a/plat/rockchip/rk3368/platform.mk +++ b/plat/rockchip/rk3368/platform.mk @@ -51,3 +51,5 @@ BL31_SOURCES += ${RK_GIC_SOURCES} \ ENABLE_PLAT_COMPAT := 0 $(eval $(call add_define,PLAT_EXTRA_LD_SCRIPT)) + +WORKAROUND_CVE_2017_5715 := 0 diff --git a/plat/xilinx/zynqmp/platform.mk b/plat/xilinx/zynqmp/platform.mk index ca87cc8f..afc2b982 100644 --- a/plat/xilinx/zynqmp/platform.mk +++ b/plat/xilinx/zynqmp/platform.mk @@ -11,6 +11,8 @@ A53_DISABLE_NON_TEMPORAL_HINT := 0 SEPARATE_CODE_AND_RODATA := 1 override RESET_TO_BL31 := 1 +WORKAROUND_CVE_2017_5715 := 0 + ifdef ZYNQMP_ATF_MEM_BASE $(eval $(call add_define,ZYNQMP_ATF_MEM_BASE)) |