From patchwork Wed Mar 1 01:50:40 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg Ungerer X-Patchwork-Id: 9597313 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 076CB600CB for ; Wed, 1 Mar 2017 01:52:19 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id EA54D20223 for ; Wed, 1 Mar 2017 01:52:18 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id DD7D8204C1; Wed, 1 Mar 2017 01:52:18 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-1.9 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID autolearn=ham version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [65.50.211.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 4301B20223 for ; Wed, 1 Mar 2017 01:52:18 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:MIME-Version:Cc:List-Subscribe: List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id:References: In-Reply-To:Message-Id:Date:Subject:To:From:Reply-To:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Owner; bh=E5dht6wNhPBdiDNy61pEp/y4JD8PlSCEKuqwXVvDF7U=; b=ojvEKrBJIDx4gEb1KrqXdiR60D zLxdkhFhWK0e9ItjMM+lC5M9RqpaRaXT92pHAnbYC64dt/Yze7+ZmfkmOapgwSq6N1mVfyaQIojMe vdLaJPBTktg0uFyQ2AGUpEDt2HbVpjULxSjzoI+qAx8X0EX5zImhPtR1prVFEym6BLadPPuRiVtBi qUbozqF1I1gFdCJNzR0/0D2idU/gCREl/V4aRghGED9tdras9gCy73cqP8HH5w8HldWkgXT69/IxV Ttirw6l6hc6CssL/XWZZYK4FW5TjhKfuzZJprimqbe8gW84mEVY8CyPuptxscz0GYXQRNSxaectMf HhxY6oqQ==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.87 #1 (Red Hat Linux)) id 1citRB-0003xL-Qj; Wed, 01 Mar 2017 01:52:17 +0000 Received: from icp-osb-irony-out8.external.iinet.net.au ([203.59.1.225]) by bombadil.infradead.org with esmtp (Exim 4.87 #1 (Red Hat Linux)) id 1citQJ-0003Zc-7p for linux-arm-kernel@lists.infradead.org; Wed, 01 Mar 2017 01:51:24 +0000 X-IronPort-Anti-Spam-Filtered: true X-IronPort-Anti-Spam-Result: A2BbBABpKLZY/zXSMGdeGwEBAQMBAQEJAQEBg1CBaoMNmw4BAQEBBphkGoYIAoIuVwECAQEBAQECYiiEcQZ5EBgnElcZiWoMtBsmAop+ATGGB4pUhRkFnCOSLopghjaTMleBASEUCCQIhQ0dgXMuNYlwAQEB X-IPAS-Result: A2BbBABpKLZY/zXSMGdeGwEBAQMBAQEJAQEBg1CBaoMNmw4BAQEBBphkGoYIAoIuVwECAQEBAQECYiiEcQZ5EBgnElcZiWoMtBsmAop+ATGGB4pUhRkFnCOSLopghjaTMleBASEUCCQIhQ0dgXMuNYlwAQEB X-IronPort-AV: E=Sophos;i="5.35,222,1483977600"; d="scan'208";a="190856683" Received: from unknown (HELO goober.accelecon.com) ([103.48.210.53]) by icp-osb-irony-out8.iinet.net.au with ESMTP; 01 Mar 2017 09:51:02 +0800 From: Greg Ungerer To: linux-arm-kernel@lists.infradead.org Subject: [PATCHv3 4/4] ARM: versatile: support configuring versatile machine for no-MMU Date: Wed, 1 Mar 2017 11:50:40 +1000 Message-Id: <1488333040-3599-2-git-send-email-gerg@uclinux.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1488333040-3599-1-git-send-email-gerg@uclinux.org> References: <1488332385-3367-1-git-send-email-gerg@uclinux.org> <1488333040-3599-1-git-send-email-gerg@uclinux.org> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20170228_175123_533210_E9441A2D X-CRM114-Status: GOOD ( 11.99 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: robh@kernel.org, wangkefeng.wang@huawei.com, arnd@arndb.de, linus.walleij@linaro.org, nicolas.ferre@atmel.com, linux@armlinux.org.uk, Greg Ungerer MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP Allow the arm versatile machine to be configured for no-MMU operation. Older kernels had the ability to build the versatile machine with the MMU disabled (!CONFIG_MMU). Recent changes to convert the versatile machine to device tree lost this ability. (Although older kernels could be built they did not run due to a bug in the IO_ADDRESS() mapping on this machine). The motivation for this is that the versatile machine is well supported in qemu. And this provides an excellent platform for development and testing no-MMU support on ARM in general. This patch adds a versatile platform selection in the upper level arm system type menu - where it appeared in older kernel versions - when configuring for the no-MMU case. There is no visible change to the way versatile is selected for the MMU enabled case. Signed-off-by: Greg Ungerer --- arch/arm/Kconfig | 11 +++++++++++ arch/arm/Kconfig.debug | 3 ++- arch/arm/mach-versatile/Kconfig | 5 +++-- 3 files changed, 16 insertions(+), 3 deletions(-) v2: don't use a multiplatform setup, move versatile choice to top level menu v3: rebase on top of linux-4.10 diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index 186c4c2..1d9ac7c 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -353,6 +353,17 @@ config ARM_SINGLE_ARMV7M select SPARSE_IRQ select USE_OF +config ARM_SINGLE_ARCH_VERSATILE + bool "ARM Ltd. Versatile family" + depends on !MMU + select AUTO_ZRELADDR + select CLKSRC_OF + select COMMON_CLK + select GENERIC_CLOCKEVENTS + select GPIOLIB + select SPARSE_IRQ + select USE_OF + config ARCH_GEMINI bool "Cortina Systems Gemini" select CLKSRC_MMIO diff --git a/arch/arm/Kconfig.debug b/arch/arm/Kconfig.debug index d83f7c3..3f393e4 100644 --- a/arch/arm/Kconfig.debug +++ b/arch/arm/Kconfig.debug @@ -1712,7 +1712,8 @@ config DEBUG_UNCOMPRESS config UNCOMPRESS_INCLUDE string default "debug/uncompress.h" if ARCH_MULTIPLATFORM || ARCH_MSM || \ - PLAT_SAMSUNG || ARM_SINGLE_ARMV7M + PLAT_SAMSUNG || ARM_SINGLE_ARMV7M || \ + ARM_SINGLE_ARCH_VERSATILE default "mach/uncompress.h" config EARLY_PRINTK diff --git a/arch/arm/mach-versatile/Kconfig b/arch/arm/mach-versatile/Kconfig index c257d40..c03a8c8 100644 --- a/arch/arm/mach-versatile/Kconfig +++ b/arch/arm/mach-versatile/Kconfig @@ -1,6 +1,7 @@ config ARCH_VERSATILE - bool "ARM Ltd. Versatile family" - depends on ARCH_MULTI_V5 + bool "ARM Ltd. Versatile family" if ARCH_MULTI_V5 + depends on ARCH_MULTI_V5 || ARM_SINGLE_ARCH_VERSATILE + default y if ARM_SINGLE_ARCH_VERSATILE select ARM_AMBA select ARM_TIMER_SP804 select ARM_VIC