diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2013-06-03 15:38:58 +0200 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2013-06-24 16:15:19 +0200 |
| commit | 24e860fbfdb1c3f97d17d3578a146f3b42b9ad83 (patch) | |
| tree | 57bbf13306afe75369359c26306614d344e765dc | |
| parent | 0626494d5f67c36d2df2ad7553b1db2c3e558e64 (diff) | |
| download | linux-24e860fbfdb1c3f97d17d3578a146f3b42b9ad83.tar.gz linux-24e860fbfdb1c3f97d17d3578a146f3b42b9ad83.tar.bz2 linux-24e860fbfdb1c3f97d17d3578a146f3b42b9ad83.zip | |
ARM: multiplatform: always pick one CPU type
With the new default platform code, we can always boot using DT
without requiring a board file, but we cannot build a kernel
unless we select at least one CPU core, which breaks some
"randconfig" builds.
This adapts the ARCH_MULTI_V4T and ARCH_MULTI_V5 options so we
always default to a common CPU core if no platform was enabled
that picks something else. The default we pick for ARMv4T is
ARM920T, while for ARMv5 we pick ARM926T.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
| -rw-r--r-- | arch/arm/Kconfig | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index db5aa5f2d1de..ffbaaa5405c5 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -870,20 +870,21 @@ menu "Multiple platform selection" comment "CPU Core family selection" -config ARCH_MULTI_V4 - bool "ARMv4 based platforms (FA526, StrongARM)" - depends on !ARCH_MULTI_V6_V7 - select ARCH_MULTI_V4_V5 - config ARCH_MULTI_V4T bool "ARMv4T based platforms (ARM720T, ARM920T, ...)" depends on !ARCH_MULTI_V6_V7 select ARCH_MULTI_V4_V5 + select CPU_ARM920T if !(CPU_ARM7TDMI || CPU_ARM720T || \ + CPU_ARM740T || CPU_ARM9TDMI || CPU_ARM922T || \ + CPU_ARM925T || CPU_ARM940T) config ARCH_MULTI_V5 bool "ARMv5 based platforms (ARM926T, XSCALE, PJ1, ...)" depends on !ARCH_MULTI_V6_V7 select ARCH_MULTI_V4_V5 + select CPU_ARM926T if (!CPU_ARM946E || CPU_ARM1020 || \ + CPU_ARM1020E || CPU_ARM1022 || CPU_ARM1026 || \ + CPU_XSCALE || CPU_XSC3 || CPU_MOHAWK || CPU_FEROCEON) config ARCH_MULTI_V4_V5 bool |