diff options
| author | Will Deacon <will.deacon@arm.com> | 2012-02-24 06:13:37 -0500 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2012-02-27 06:22:38 -0500 |
| commit | 43a6955fa8c3ac2e7c31959e8b77a1166dbd13f3 (patch) | |
| tree | 9363dec558fe731730cf22b9be2bcf0817fcf76d /arch | |
| parent | efbc74ace95338484f8d732037b99c7c77098fce (diff) | |
ARM: 7346/1: errata: fix PL310 erratum #753970 workaround selection
Commit fa0ce403 ("ARM: 7162/1: errata: tidy up Kconfig options for PL310
errata workarounds") introduced a consistent naming scheme for errata
workarounds, but forgot to update the platforms selecting workarounds
using the old names.
This patch updates ux500 and vexpress to select the appropriate PL310
errata workarounds.
Signed-off-by: Will Deacon <will.deacon@arm.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/mach-ux500/Kconfig | 2 | ||||
| -rw-r--r-- | arch/arm/mach-vexpress/Kconfig | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mach-ux500/Kconfig b/arch/arm/mach-ux500/Kconfig index 52af00446a63..c59e8b892d6b 100644 --- a/arch/arm/mach-ux500/Kconfig +++ b/arch/arm/mach-ux500/Kconfig | |||
| @@ -5,7 +5,7 @@ config UX500_SOC_COMMON | |||
| 5 | default y | 5 | default y |
| 6 | select ARM_GIC | 6 | select ARM_GIC |
| 7 | select HAS_MTU | 7 | select HAS_MTU |
| 8 | select ARM_ERRATA_753970 | 8 | select PL310_ERRATA_753970 |
| 9 | select ARM_ERRATA_754322 | 9 | select ARM_ERRATA_754322 |
| 10 | select ARM_ERRATA_764369 | 10 | select ARM_ERRATA_764369 |
| 11 | 11 | ||
diff --git a/arch/arm/mach-vexpress/Kconfig b/arch/arm/mach-vexpress/Kconfig index 9b3d0fbaee72..88c3ba151e87 100644 --- a/arch/arm/mach-vexpress/Kconfig +++ b/arch/arm/mach-vexpress/Kconfig | |||
| @@ -7,7 +7,7 @@ config ARCH_VEXPRESS_CA9X4 | |||
| 7 | select ARM_GIC | 7 | select ARM_GIC |
| 8 | select ARM_ERRATA_720789 | 8 | select ARM_ERRATA_720789 |
| 9 | select ARM_ERRATA_751472 | 9 | select ARM_ERRATA_751472 |
| 10 | select ARM_ERRATA_753970 | 10 | select PL310_ERRATA_753970 |
| 11 | select HAVE_SMP | 11 | select HAVE_SMP |
| 12 | select MIGHT_HAVE_CACHE_L2X0 | 12 | select MIGHT_HAVE_CACHE_L2X0 |
| 13 | 13 | ||