diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2014-02-26 17:39:12 +0100 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2014-03-21 18:26:07 +0100 |
| commit | fa04e209aeb251bebfe6a7a5966a3d5bbd5c13b5 (patch) | |
| tree | ca8a54ca3492c72a5d1f4d13e0a668773b4b0eb0 | |
| parent | edd4c7208b94efebe579171bfc2253362fc8193a (diff) | |
| download | linux-stable-fa04e209aeb251bebfe6a7a5966a3d5bbd5c13b5.tar.gz linux-stable-fa04e209aeb251bebfe6a7a5966a3d5bbd5c13b5.tar.bz2 linux-stable-fa04e209aeb251bebfe6a7a5966a3d5bbd5c13b5.zip | |
ARM: rpc: autoselect CPU_SA110
ARCH_RPC no longer supports other CPUs aside from StrongARM110,
so we can make the option implicitly selected by the platform
and no longer give the option of building a kernel without CPU
support.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Cc: Russell King <linux@arm.linux.org.uk>
| -rw-r--r-- | arch/arm/Kconfig | 1 | ||||
| -rw-r--r-- | arch/arm/mm/Kconfig | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index f18f8b848517..2d93211c6879 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -698,6 +698,7 @@ config ARCH_RPC select ARCH_MAY_HAVE_PC_FDC select ARCH_SPARSEMEM_ENABLE select ARCH_USES_GETTIMEOFFSET + select CPU_SA110 select FIQ select HAVE_IDE select HAVE_PATA_PLATFORM diff --git a/arch/arm/mm/Kconfig b/arch/arm/mm/Kconfig index 1f8fed94c2a4..9e832295ecaa 100644 --- a/arch/arm/mm/Kconfig +++ b/arch/arm/mm/Kconfig @@ -264,7 +264,7 @@ config CPU_ARM1026 # SA110 config CPU_SA110 - bool "Support StrongARM(R) SA-110 processor" if ARCH_RPC + bool select CPU_32v3 if ARCH_RPC select CPU_32v4 if !ARCH_RPC select CPU_ABRT_EV4 |