summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authordavidcunado-arm <david.cunado@arm.com>2017-03-10 14:21:09 +0100
committerGitHub <noreply@github.com>2017-03-10 14:21:09 +0100
commitfa971fca2f16b3085499bc79066a8ba792841f13 (patch)
treee8a1dd8a5f0609e64b241939b2d66cfa98ba2e8e
parent6abb19bf1c0e38e230f45fa416c9691659689dde (diff)
parent1f38d3c955730513a0ed625adb3b83b668cb1764 (diff)
Merge pull request #864 from vwadekar/enable-errata-tegra210
Tegra210: enable errata for Cortex-A57 and Cortex-A53 CPUs
-rw-r--r--plat/nvidia/tegra/platform.mk10
-rw-r--r--plat/nvidia/tegra/soc/t210/platform_t210.mk15
2 files changed, 13 insertions, 12 deletions
diff --git a/plat/nvidia/tegra/platform.mk b/plat/nvidia/tegra/platform.mk
index b168634e..2eeffca7 100644
--- a/plat/nvidia/tegra/platform.mk
+++ b/plat/nvidia/tegra/platform.mk
@@ -1,5 +1,5 @@
#
-# Copyright (c) 2015-2016, ARM Limited and Contributors. All rights reserved.
+# Copyright (c) 2015-2017, ARM Limited and Contributors. All rights reserved.
#
# Redistribution and use in source and binary forms, with or without
# modification, are permitted provided that the following conditions are met:
@@ -36,14 +36,6 @@ PSCI_EXTENDED_STATE_ID := 1
# Disable the PSCI platform compatibility layer
ENABLE_PLAT_COMPAT := 0
-# Disable cache non-temporal hint for A57
-A57_DISABLE_NON_TEMPORAL_HINT := 0
-$(eval $(call add_define,A57_DISABLE_NON_TEMPORAL_HINT))
-
-# Disable cache non-temporal hint for A53
-A53_DISABLE_NON_TEMPORAL_HINT := 0
-$(eval $(call add_define,A53_DISABLE_NON_TEMPORAL_HINT))
-
include plat/nvidia/tegra/common/tegra_common.mk
include ${SOC_DIR}/platform_${TARGET_SOC}.mk
diff --git a/plat/nvidia/tegra/soc/t210/platform_t210.mk b/plat/nvidia/tegra/soc/t210/platform_t210.mk
index d0fe18f9..822240f7 100644
--- a/plat/nvidia/tegra/soc/t210/platform_t210.mk
+++ b/plat/nvidia/tegra/soc/t210/platform_t210.mk
@@ -1,5 +1,5 @@
#
-# Copyright (c) 2015, ARM Limited and Contributors. All rights reserved.
+# Copyright (c) 2015-2017, ARM Limited and Contributors. All rights reserved.
#
# Redistribution and use in source and binary forms, with or without
# modification, are permitted provided that the following conditions are met:
@@ -54,6 +54,15 @@ BL31_SOURCES += lib/cpus/aarch64/cortex_a53.S \
${SOC_DIR}/plat_setup.c \
${SOC_DIR}/plat_secondary.c
-# Enable workarounds for selected Cortex-A53 erratas.
-ERRATA_A53_826319 := 1
+# Enable workarounds for selected Cortex-A57 erratas.
+A57_DISABLE_NON_TEMPORAL_HINT := 1
+ERRATA_A57_826974 := 1
+ERRATA_A57_826977 := 1
+ERRATA_A57_828024 := 1
+ERRATA_A57_829520 := 1
+ERRATA_A57_833471 := 1
+# Enable workarounds for selected Cortex-A53 erratas.
+A53_DISABLE_NON_TEMPORAL_HINT := 1
+ERRATA_A53_826319 := 1
+ERRATA_A53_836870 := 1