Juno: Disable 859971 and 859972 errata workarounds

Earlier patches added errata workarounds 859972 for Cortex-A72, and
859972 for Cortex-A57 CPUs. Explicitly disable the workaround for Juno.

Also reorganize errata workaround flags.

No functional changes.

Change-Id: I3fe3745de57d77e5bf52012826d3969fe5d4844e
Signed-off-by: Eleanor Bonnici <Eleanor.bonnici@arm.com>
Signed-off-by: Jeenu Viswambharan <jeenu.viswambharan@arm.com>

diff --git a/plat/arm/board/juno/platform.mk b/plat/arm/board/juno/platform.mk
index b972d26abadcf69a26ac5d590699a70b9a25b946..79916cdadef167f8b438baf65202a51f0218e4bc 100644 (file)
--- a/plat/arm/board/juno/platform.mk
+++ b/plat/arm/board/juno/platform.mk
@@ -55,10 +55,14 @@ BL31_SOURCES                +=      lib/cpus/aarch64/cortex_a53.S           \
                                ${JUNO_SECURITY_SOURCES}
 endif
 
-# Enable workarounds for selected Cortex-A53 and A57 errata.
+# Errata workarounds for Cortex-A53:
+ERRATA_A53_826319              :=      1
 ERRATA_A53_835769              :=      1
+ERRATA_A53_836870              :=      1
 ERRATA_A53_843419              :=      1
 ERRATA_A53_855873              :=      1
+
+# Errata workarounds for Cortex-A57:
 ERRATA_A57_806969              :=      0
 ERRATA_A57_813419              :=      1
 ERRATA_A57_813420              :=      1
@@ -67,10 +71,10 @@ ERRATA_A57_826977           :=      1
 ERRATA_A57_828024              :=      1
 ERRATA_A57_829520              :=      1
 ERRATA_A57_833471              :=      1
+ERRATA_A57_859972              :=      0
 
-# Enable workarounds for selected Cortex-A53 errata.
-ERRATA_A53_826319              :=      1
-ERRATA_A53_836870              :=      1
+# Errata workarounds for Cortex-A72:
+ERRATA_A72_859971              :=      0
 
 # Enable option to skip L1 data cache flush during the Cortex-A57 cluster
 # power down sequence