diff options
author | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-01-17 13:23:31 -0500 |
---|---|---|
committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-02-02 16:23:27 -0500 |
commit | 74200e6421882bfb53677d63a134d89a919815c1 (patch) | |
tree | 4af927e1e1a112881450f9b339b60f91e5100a81 | |
parent | e399b1a4e1d205bdc816cb550d2064f2eb1ddc4c (diff) |
ARM: v6k: Realview EB 11MPCore and PB11MPCore use V6K architecture CPUs
Make Realview EB ARM11MPCore and PB11MPCore select the new V6K CPU
option.
Tested-by: Will Deacon <will.deacon@arm.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
-rw-r--r-- | arch/arm/mach-realview/Kconfig | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/arch/arm/mach-realview/Kconfig b/arch/arm/mach-realview/Kconfig index 7ca138a943a9..b9a9805e4828 100644 --- a/arch/arm/mach-realview/Kconfig +++ b/arch/arm/mach-realview/Kconfig | |||
@@ -19,7 +19,7 @@ config REALVIEW_EB_A9MP | |||
19 | config REALVIEW_EB_ARM11MP | 19 | config REALVIEW_EB_ARM11MP |
20 | bool "Support ARM11MPCore Tile" | 20 | bool "Support ARM11MPCore Tile" |
21 | depends on MACH_REALVIEW_EB | 21 | depends on MACH_REALVIEW_EB |
22 | select CPU_V6 | 22 | select CPU_V6K |
23 | select ARCH_HAS_BARRIERS if SMP | 23 | select ARCH_HAS_BARRIERS if SMP |
24 | help | 24 | help |
25 | Enable support for the ARM11MPCore tile fitted to the Realview(R) | 25 | Enable support for the ARM11MPCore tile fitted to the Realview(R) |
@@ -36,7 +36,7 @@ config REALVIEW_EB_ARM11MP_REVB | |||
36 | 36 | ||
37 | config MACH_REALVIEW_PB11MP | 37 | config MACH_REALVIEW_PB11MP |
38 | bool "Support RealView(R) Platform Baseboard for ARM11MPCore" | 38 | bool "Support RealView(R) Platform Baseboard for ARM11MPCore" |
39 | select CPU_V6 | 39 | select CPU_V6K |
40 | select ARM_GIC | 40 | select ARM_GIC |
41 | select HAVE_PATA_PLATFORM | 41 | select HAVE_PATA_PLATFORM |
42 | select ARCH_HAS_BARRIERS if SMP | 42 | select ARCH_HAS_BARRIERS if SMP |
@@ -45,6 +45,7 @@ config MACH_REALVIEW_PB11MP | |||
45 | the ARM11MPCore. This platform has an on-board ARM11MPCore and has | 45 | the ARM11MPCore. This platform has an on-board ARM11MPCore and has |
46 | support for PCI-E and Compact Flash. | 46 | support for PCI-E and Compact Flash. |
47 | 47 | ||
48 | # ARMv6 CPU without K extensions, but does have the new exclusive ops | ||
48 | config MACH_REALVIEW_PB1176 | 49 | config MACH_REALVIEW_PB1176 |
49 | bool "Support RealView(R) Platform Baseboard for ARM1176JZF-S" | 50 | bool "Support RealView(R) Platform Baseboard for ARM1176JZF-S" |
50 | select CPU_V6 | 51 | select CPU_V6 |