Skip to content

Commit

Permalink
ARM: pick Versatile by default for !MMU
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Arnd Bergmann committed Feb 14, 2013
1 parent a02e0a8 commit 1420b22
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 1 deletion.
3 changes: 2 additions & 1 deletion arch/arm/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
5 changes: 5 additions & 0 deletions arch/arm/mach-versatile/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -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

0 comments on commit 1420b22

Please sign in to comment.