diff mbox

ARM: nommu: remove ARCH_MULTIPLATFORM's dependency on CONFIG_MMU

Message ID 1370629625-30671-1-git-send-email-jonathan.austin@arm.com (mailing list archive)
State New, archived
Headers show

Commit Message

Jonathan Austin June 7, 2013, 6:27 p.m. UTC 
From: Arnd Bergmann <arnd@arndb.de>

ARCH_MULTIPLATFORM currently requires CONFIG_MMU to be set, however it is
intended that all future V6/V7 platforms are compatible with
ARCH_MULTIPLATFORM, and so this requirement precludes that addition of new
!MMU platforms.

Furthermore, this requirement creates unnecessary differences between the MMU
and !MMU worlds, which is undesirable.

This patch allows ARCH_MULTIPLATFORM to remain selected in a !MMU
configuration. There is still a need to hardcode CONFIG_DRAM_BASE and other
parameters relating to the system, so this patch is less about making an
actual multiplatform kernel for !MMU and more about consistency across the
kernel.

Along with the nommu-fixes, R7 support and MPU support already sent to this
list, this patch is sufficient to allow building and booting of kernel for a
Cortex-R7 core on a Versatile Express platform.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Jonathan Austin <jonathan.austin@arm.com>
---

This patch was written by Arnd and after some discussion/testing at my end he
asked me to send it to the list with a fill description.

I've used this to boot an R7 on a vexpress with a 'multiplatform' kernel

Jonny

 arch/arm/Kconfig |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)
diff mbox

Patch

diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index 49d993c..5a61686 100644
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -289,8 +289,7 @@  choice
 
 config ARCH_MULTIPLATFORM
 	bool "Allow multiple platforms to be selected"
-	depends on MMU
-	select ARM_PATCH_PHYS_VIRT
+	select ARM_PATCH_PHYS_VIRT if MMU
 	select AUTO_ZRELADDR
 	select COMMON_CLK
 	select MULTI_IRQ_HANDLER