From patchwork Tue Jul 23 16:41:51 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jonathan Austin X-Patchwork-Id: 2832085 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id A8AB1C0319 for ; Tue, 23 Jul 2013 16:42:46 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 9CED32025C for ; Tue, 23 Jul 2013 16:42:45 +0000 (UTC) Received: from casper.infradead.org (casper.infradead.org [85.118.1.10]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 18DB720262 for ; Tue, 23 Jul 2013 16:42:44 +0000 (UTC) Received: from merlin.infradead.org ([2001:4978:20e::2]) by casper.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1V1ffc-0006DB-0b; Tue, 23 Jul 2013 16:42:40 +0000 Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1V1ffZ-0000ru-RT; Tue, 23 Jul 2013 16:42:37 +0000 Received: from service87.mimecast.com ([91.220.42.44]) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1V1ffW-0000rW-MM for linux-arm-kernel@lists.infradead.org; Tue, 23 Jul 2013 16:42:35 +0000 Received: from cam-owa1.Emea.Arm.com (fw-tnat.cambridge.arm.com [217.140.96.21]) by service87.mimecast.com; Tue, 23 Jul 2013 17:42:09 +0100 Received: from e102895-lin.cambridge.arm.com ([10.1.255.212]) by cam-owa1.Emea.Arm.com with Microsoft SMTPSVC(6.0.3790.0); Tue, 23 Jul 2013 17:42:06 +0100 From: Jonathan Austin To: linux-arm-kernel@lists.infradead.org Subject: [PATCH resend] ARM: nommu: remove ARCH_MULTIPLATFORM's dependency on CONFIG_MMU Date: Tue, 23 Jul 2013 17:41:51 +0100 Message-Id: <1374597712-18112-1-git-send-email-jonathan.austin@arm.com> X-Mailer: git-send-email 1.7.9.5 X-OriginalArrivalTime: 23 Jul 2013 16:42:06.0396 (UTC) FILETIME=[91272FC0:01CE87C3] X-MC-Unique: 113072317420906001 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20130723_124234_909655_14388D08 X-CRM114-Status: GOOD ( 12.50 ) X-Spam-Score: -2.6 (--) Cc: Jonathan Austin , Arnd Bergmann X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Spam-Status: No, score=-4.2 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Arnd Bergmann 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 Signed-off-by: Jonathan Austin --- 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 full description. I'm resending this after testing it still allows R7 to boot on 3.11. Assuming no comments, I'll drop this in the patch system shortly. Any calls for Cc-ing stable? Jonny arch/arm/Kconfig | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) 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