ARM: pick Versatile by default for !MMU

The introduction of ARCH_MULTIPLATFORM changed
the default for nommu kernels from Versatile to
Integrator, which is less common, and does not
currently build for allnoconfig because that does
not select any of the CPUs.

This also ensures that at least one of the three
board files in versatile are enabled, which lets
us successfully build an allnoconfig kernel.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Cc: Russell King <linux@arm.linux.org.uk>

diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index 91d4aeaa772b4f4750d4ca437932160af6d299be..b934d90a61e4ae4f1ce585e7a5ce5b69715a175a 100644 (file)
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -261,7 +261,8 @@ config MMU
 #
 choice
        prompt "ARM system type"
-       default ARCH_MULTIPLATFORM
+       default ARCH_VERSATILE if !MMU
+       default ARCH_MULTIPLATFORM if MMU
 
 config ARCH_MULTIPLATFORM
        bool "Allow multiple platforms to be selected"

diff --git a/arch/arm/mach-versatile/Kconfig b/arch/arm/mach-versatile/Kconfig
index 63d8e9f81b99aa73970c9985dd657ec4a42705a9..1dba3688275f962e90576c41b14d5cb2f883d4cd 100644 (file)
--- a/arch/arm/mach-versatile/Kconfig
+++ b/arch/arm/mach-versatile/Kconfig
@@ -25,4 +25,9 @@ config MACH_VERSATILE_DT
          Include support for the ARM(R) Versatile/PB platform,
          using the device tree for discovery
 
+config MACH_VERSATILE_AUTO
+       def_bool y
+       depends on !ARCH_VERSATILE_PB && !MACH_VERSATILE_AB
+       select MACH_VERSATILE_DT
+
 endmenu