From patchwork Thu Feb 25 13:15:09 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Linus Walleij X-Patchwork-Id: 62884 Delivered-To: patch@linaro.org Received: by 10.112.199.169 with SMTP id jl9csp155334lbc; Thu, 25 Feb 2016 05:17:11 -0800 (PST) X-Received: by 10.66.121.10 with SMTP id lg10mr62632911pab.59.1456406229865; Thu, 25 Feb 2016 05:17:09 -0800 (PST) Return-Path: Received: from bombadil.infradead.org (bombadil.infradead.org. [2001:1868:205::9]) by mx.google.com with ESMTPS id f1si554683pas.133.2016.02.25.05.17.09 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 25 Feb 2016 05:17:09 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-arm-kernel-bounces+patch=linaro.org@lists.infradead.org designates 2001:1868:205::9 as permitted sender) client-ip=2001:1868:205::9; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-arm-kernel-bounces+patch=linaro.org@lists.infradead.org designates 2001:1868:205::9 as permitted sender) smtp.mailfrom=linux-arm-kernel-bounces+patch=linaro.org@lists.infradead.org; dkim=neutral (body hash did not verify) header.i=@linaro.org Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1aYvm6-0003MI-1E; Thu, 25 Feb 2016 13:16:10 +0000 Received: from mail-lf0-x233.google.com ([2a00:1450:4010:c07::233]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1aYvlp-000378-4T for linux-arm-kernel@lists.infradead.org; Thu, 25 Feb 2016 13:15:59 +0000 Received: by mail-lf0-x233.google.com with SMTP id m1so32909897lfg.0 for ; Thu, 25 Feb 2016 05:15:32 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=Y9pU+bZ9bmTY7ViHriJji3WFdLWKLHLjhH3JJc3I6y8=; b=BMmlXs09FTWyft7KTy81TNYLiGYD4pXfBndWU8p5vf5IYfWsTm0Qo8CGUb0jSvuAnC LNlK8415XkgkTMZgSC1Yw3RjxyhxXA5jKNoVyeoQ8ekITTxGefkdHqNM9e8ZhnrgDtqV SwFmsM7TGj75KIP1qFXJnWpk+C3m6qA/jSq6E= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=Y9pU+bZ9bmTY7ViHriJji3WFdLWKLHLjhH3JJc3I6y8=; b=A8roX+S67zvmMrF9K113aeTNQIAL3t0HLpEsQNPJq+JDNdmu69lXwaDog5+r643zZI bg6u/yhgJ1le/45x5hZcd5eWs3KF6kabNVglpc6N2IuqDARHs/ljY/lE5vn5ft5f7m6A EF/b1SmTJTwf54FZ62xI5Xr1nNJA8Lxk11/BXatIivz1TWA/gBkAS0/cLAOc/Xekd3Zx m0Ody3xCaY2u9MwYqoBTFXDx+0lK1wVsMBedfzw1l+dBfRNJ366mFF5Io1gUZJ+T6k6/ tgJ9vxxr2CtaUlrnA6jMygb0mEw4PrR7EI4id0wHWmcV6lL+vViLiHht2AgOcms0HEZ5 1wNA== X-Gm-Message-State: AG10YOSNndHetDMsbqe7XETrY24+zZej9ZkTo72W/NTL5VjVtWKdCa4dddIDKdOcHMEGS808 X-Received: by 10.25.208.143 with SMTP id h137mr13521054lfg.110.1456406131243; Thu, 25 Feb 2016 05:15:31 -0800 (PST) Received: from localhost.localdomain ([85.235.10.227]) by smtp.gmail.com with ESMTPSA id l129sm1145801lfl.18.2016.02.25.05.15.29 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 25 Feb 2016 05:15:30 -0800 (PST) From: Linus Walleij To: linux-arm-kernel@lists.infradead.org, Arnd Bergmann Subject: [PATCH 2/4] ARM: realview: reduce the RealView Kconfig Date: Thu, 25 Feb 2016 14:15:09 +0100 Message-Id: <1456406111-18579-3-git-send-email-linus.walleij@linaro.org> X-Mailer: git-send-email 2.4.3 In-Reply-To: <1456406111-18579-1-git-send-email-linus.walleij@linaro.org> References: <1456406111-18579-1-git-send-email-linus.walleij@linaro.org> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20160225_051553_753812_B9A7D48F X-CRM114-Status: GOOD ( 19.17 ) X-Spam-Score: -2.0 (--) X-Spam-Report: SpamAssassin version 3.4.0 on bombadil.infradead.org summary: Content analysis details: (-2.0 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 SPF_PASS SPF: sender matches SPF record -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Mark Rutland , Russell King , Pawel Moll , Marc Zyngier , Linus Walleij , Will Deacon MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patch=linaro.org@lists.infradead.org We select all we need to the device tree boot and and do not really need all the sub-options to get this running smoothly. We will support the ARMv5, ARMv6, ARMv7 or ARMv6+ARMv7 build depending on what the user selects. Signed-off-by: Linus Walleij --- arch/arm/mach-realview/Kconfig | 127 +++-------------------------------------- 1 file changed, 8 insertions(+), 119 deletions(-) -- 2.4.3 _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel diff --git a/arch/arm/mach-realview/Kconfig b/arch/arm/mach-realview/Kconfig index def40a0dd60c..cfb4c573638f 100644 --- a/arch/arm/mach-realview/Kconfig +++ b/arch/arm/mach-realview/Kconfig @@ -16,9 +16,13 @@ config REALVIEW_DT bool "Support RealView(R) Device Tree based boot" select ARM_GIC select CLK_SP810 - select HAVE_SMP + select CPU_ARM926T if ARCH_MULTI_V5 + select HAVE_ARM_SCU if SMP + select HAVE_ARM_TWD if SMP + select HAVE_PATA_PLATFORM + select HAVE_SMP if ARCH_MULTI_V6 + select HAVE_TCM select ICST - select MACH_REALVIEW_EB if ARCH_MULTI_V5 select MFD_SYSCON select POWER_RESET select POWER_RESET_VERSATILE @@ -26,129 +30,14 @@ config REALVIEW_DT select SMP_ON_UP if SMP select SOC_REALVIEW select USE_OF + select ZONE_DMA help Include support for booting the ARM(R) RealView(R) evaluation boards using a device tree machine description. -config MACH_REALVIEW_EB - bool "Support RealView(R) Emulation Baseboard" - select ARM_GIC - select CPU_ARM926T if ARCH_MULTI_V5 - help - Include support for the ARM(R) RealView(R) Emulation Baseboard - platform. On an ARMv5 kernel, this will include support for - the ARM926EJ-S core tile, while on an ARMv6/v7 kernel, at least - one of the ARM1136, ARM1176, ARM11MPCore or Cortex-A9MPCore - core tile options should be enabled. - -config REALVIEW_EB_ARM1136 - bool "Support ARM1136J(F)-S Tile" - depends on MACH_REALVIEW_EB && ARCH_MULTI_V6 - select CPU_V6 - help - Enable support for the ARM1136 tile fitted to the - Realview(R) Emulation Baseboard platform. - -config REALVIEW_EB_ARM1176 - bool "Support ARM1176JZ(F)-S Tile" - depends on MACH_REALVIEW_EB && ARCH_MULTI_V6 - help - Enable support for the ARM1176 tile fitted to the - Realview(R) Emulation Baseboard platform. - -config REALVIEW_EB_A9MP - bool "Support Multicore Cortex-A9 Tile" - depends on MACH_REALVIEW_EB && ARCH_MULTI_V7 - select HAVE_ARM_SCU if SMP - select HAVE_ARM_TWD if SMP - select HAVE_SMP - select MIGHT_HAVE_CACHE_L2X0 - help - Enable support for the Cortex-A9MPCore tile fitted to the - Realview(R) Emulation Baseboard platform. - -config REALVIEW_EB_ARM11MP - bool "Support ARM11MPCore Tile" - depends on MACH_REALVIEW_EB && ARCH_MULTI_V6 - select HAVE_ARM_SCU if SMP - select HAVE_ARM_TWD if SMP - select HAVE_SMP - select MIGHT_HAVE_CACHE_L2X0 - help - Enable support for the ARM11MPCore tile fitted to the Realview(R) - Emulation Baseboard platform. - -config REALVIEW_EB_ARM11MP_REVB - bool "Support ARM11MPCore RevB Tile" - depends on REALVIEW_EB_ARM11MP && ARCH_MULTI_V6 - help - Enable support for the ARM11MPCore Revision B tile on the - Realview(R) Emulation Baseboard platform. Since there are device - address differences, a kernel built with this option enabled is - not compatible with other revisions of the ARM11MPCore tile. - -config MACH_REALVIEW_PB11MP - bool "Support RealView(R) Platform Baseboard for ARM11MPCore" - depends on ARCH_MULTI_V6 - select ARM_GIC - select HAVE_ARM_SCU if SMP - select HAVE_ARM_TWD if SMP - select HAVE_PATA_PLATFORM - select HAVE_SMP - select MIGHT_HAVE_CACHE_L2X0 - help - Include support for the ARM(R) RealView(R) Platform Baseboard for - the ARM11MPCore. This platform has an on-board ARM11MPCore and has - support for PCI-E and Compact Flash. - -# ARMv6 CPU without K extensions, but does have the new exclusive ops -config MACH_REALVIEW_PB1176 - bool "Support RealView(R) Platform Baseboard for ARM1176JZF-S" - depends on ARCH_MULTI_V6 - select ARM_GIC - select CPU_V6 - select HAVE_TCM - select MIGHT_HAVE_CACHE_L2X0 - help - Include support for the ARM(R) RealView(R) Platform Baseboard for - ARM1176JZF-S. - -config REALVIEW_PB1176_SECURE_FLASH - bool "Allow access to the secure flash memory block" - depends on MACH_REALVIEW_PB1176 - default n - help - Select this option if Linux will only run in secure mode on the - RealView PB1176 platform and access to the secure flash memory - block (64MB @ 0x3c000000) is required. - -config MACH_REALVIEW_PBA8 - bool "Support RealView(R) Platform Baseboard for Cortex(tm)-A8 platform" - depends on ARCH_MULTI_V7 - select ARM_GIC - select HAVE_PATA_PLATFORM - help - Include support for the ARM(R) RealView Platform Baseboard for - Cortex(tm)-A8. This platform has an on-board Cortex-A8 and has - support for PCI-E and Compact Flash. - -config MACH_REALVIEW_PBX - bool "Support RealView(R) Platform Baseboard Explore for Cortex-A9" - depends on ARCH_MULTI_V7 - select ARM_GIC - select HAVE_ARM_SCU if SMP - select HAVE_ARM_TWD if SMP - select HAVE_PATA_PLATFORM - select HAVE_SMP - select MIGHT_HAVE_CACHE_L2X0 - select ZONE_DMA - help - Include support for the ARM(R) RealView(R) Platform Baseboard - Explore. - config REALVIEW_HIGH_PHYS_OFFSET bool "High physical base address for the RealView platform" - depends on MMU && !MACH_REALVIEW_PB1176 + depends on MMU default y help RealView boards other than PB1176 have the RAM available at