From patchwork Mon Jun 18 14:19:05 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg Ungerer X-Patchwork-Id: 10471685 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 722D16032A for ; Mon, 18 Jun 2018 14:21:17 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 62F7A28B29 for ; Mon, 18 Jun 2018 14:21:17 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 57A5228B05; Mon, 18 Jun 2018 14:21:17 +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=-2.9 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,MAILING_LIST_MULTI autolearn=ham version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.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 D89A228B03 for ; Mon, 18 Jun 2018 14:21:16 +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=ImScsvKO/NUH7NUzAazuvjeNNm5Pmv/Y6UB+af/wtiM=; b=m4jRJGlX/jq6zuRfKDnCNy0+J+ ckyRIqCPWO9EWDTgBowIeR+d9FESwfzknIKn3/spw3C8RyPZkl81oy97sNkDWdrFfncUdBTXDmPWs nqoH8Wt0m3EEDooFFWWe0foRWVDIEN6G2LIanEw35TgD6nDzHWd+GpU4h5XFt7po9vWxaX4QVqQHv x9FpbAeiGpx61jNtc3X0jZxPLrlGD7mRN8XWbwGsx+STDmLYVRgnCBdlYXoaBBImLYtbvMdQHeHc1 U1hHrkgaE1fdSP6LxJ9aPrdYchLwF2R1gKXHx0bhGJS9xbaThnONEA/tmRFAl2wLEWiuaHlLXC80S NS5XoU9g==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1fUv1k-0005jP-Rc; Mon, 18 Jun 2018 14:21:04 +0000 Received: from icp-osb-irony-out3.external.iinet.net.au ([203.59.1.153]) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1fUv0b-0003fO-67 for linux-arm-kernel@lists.infradead.org; Mon, 18 Jun 2018 14:19:57 +0000 X-IronPort-Anti-Spam-Filtered: true X-IronPort-Anti-Spam-Result: =?us-ascii?q?A2ArAQDdvidb/zXSMGdbGgEBAQEBAgEBA?= =?us-ascii?q?QEIAQEBAYNIgU8SKIt9jE9LBoE/lGCBeB4YAYRAAoJbITQYAQIBAQEBAQECbSi?= =?us-ascii?q?FKQZ5EBgnElcHEoMlgXQMqzUaAoQ/g2iBaIhUgQyBB4EPjVcCmRYIAY5+iCOFI?= =?us-ascii?q?5MOOIFSMxoIKAiCfoIhF44pLTB6AQGPVQEB?= X-IPAS-Result: =?us-ascii?q?A2ArAQDdvidb/zXSMGdbGgEBAQEBAgEBAQEIAQEBAYNIgU8?= =?us-ascii?q?SKIt9jE9LBoE/lGCBeB4YAYRAAoJbITQYAQIBAQEBAQECbSiFKQZ5EBgnElcHE?= =?us-ascii?q?oMlgXQMqzUaAoQ/g2iBaIhUgQyBB4EPjVcCmRYIAY5+iCOFI5MOOIFSMxoIKAi?= =?us-ascii?q?CfoIhF44pLTB6AQGPVQEB?= X-IronPort-AV: E=Sophos;i="5.51,239,1526313600"; d="scan'208";a="88321306" Received: from unknown (HELO goober.digi.com) ([103.48.210.53]) by icp-osb-irony-out3.iinet.net.au with ESMTP; 18 Jun 2018 22:19:47 +0800 From: Greg Ungerer To: linux-arm-kernel@lists.infradead.org, linux@armlinux.org.uk Subject: [PATCHv4 4/4] ARM: versatile: support configuring versatile machine for no-MMU Date: Tue, 19 Jun 2018 00:19:05 +1000 Message-Id: <20180618141905.7789-5-gerg@linux-m68k.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180618141905.7789-1-gerg@linux-m68k.org> References: <20180618141905.7789-1-gerg@linux-m68k.org> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20180618_071953_520894_BF6DFCDB X-CRM114-Status: GOOD ( 11.00 ) 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: vladimir.murzin@arm.com, 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 v3: rebase on top of linux-4.17 diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index 54eeb8d00bc6..0608a6a32fac 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -356,6 +356,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_EBSA110 bool "EBSA-110" select ARCH_USES_GETTIMEOFFSET diff --git a/arch/arm/Kconfig.debug b/arch/arm/Kconfig.debug index 693f84392f1b..242a0f744c8a 100644 --- a/arch/arm/Kconfig.debug +++ b/arch/arm/Kconfig.debug @@ -1836,7 +1836,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 f5c275434d6c..06ad999d5978 100644 --- a/arch/arm/mach-versatile/Kconfig +++ b/arch/arm/mach-versatile/Kconfig @@ -1,7 +1,8 @@ # SPDX-License-Identifier: GPL-2.0 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