diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-03-16 23:35:26 (GMT) |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-03-16 23:35:26 (GMT) |
| commit | bd1274dc005c2cee41771a7cc616f4709a6e6323 (patch) | |
| tree | fcfe103a499ca9e3d8fa0ecbca5b7d0d274da5ca /arch/arm/mach-realview | |
| parent | 1f0090a1eaa1b750a2fc5c99c91b790d5322a1fd (diff) | |
| parent | 3ba6e69ad887f8a814267ed36fd4bfbddf8855a9 (diff) | |
| download | linux-fsl-qoriq-bd1274dc005c2cee41771a7cc616f4709a6e6323.tar.xz | |
Merge branch 'v6v7' into devel
Conflicts:
arch/arm/include/asm/cacheflush.h
arch/arm/include/asm/proc-fns.h
arch/arm/mm/Kconfig
Diffstat (limited to 'arch/arm/mach-realview')
| -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 7ca138a..b9a9805 100644 --- a/arch/arm/mach-realview/Kconfig +++ b/arch/arm/mach-realview/Kconfig @@ -19,7 +19,7 @@ config REALVIEW_EB_A9MP config REALVIEW_EB_ARM11MP bool "Support ARM11MPCore Tile" depends on MACH_REALVIEW_EB - select CPU_V6 + select CPU_V6K select ARCH_HAS_BARRIERS if SMP help Enable support for the ARM11MPCore tile fitted to the Realview(R) @@ -36,7 +36,7 @@ config REALVIEW_EB_ARM11MP_REVB config MACH_REALVIEW_PB11MP bool "Support RealView(R) Platform Baseboard for ARM11MPCore" - select CPU_V6 + select CPU_V6K select ARM_GIC select HAVE_PATA_PLATFORM select ARCH_HAS_BARRIERS if SMP @@ -45,6 +45,7 @@ config MACH_REALVIEW_PB11MP the ARM11MPCore. This platform has an on-board ARM11MPCore and has support for PCI-E and Compact Flash. +# ARMv6 CPU without K extensions, but does have the new exclusive ops config MACH_REALVIEW_PB1176 bool "Support RealView(R) Platform Baseboard for ARM1176JZF-S" select CPU_V6 |