From patchwork Thu Dec 27 23:20:50 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tony Prisk X-Patchwork-Id: 1913931 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork2.kernel.org Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) by patchwork2.kernel.org (Postfix) with ESMTP id 47728DF2A2 for ; Thu, 27 Dec 2012 23:24:12 +0000 (UTC) Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.76 #1 (Red Hat Linux)) id 1ToMlP-0005iG-Og; Thu, 27 Dec 2012 23:21:23 +0000 Received: from server.prisktech.co.nz ([115.188.14.127]) by merlin.infradead.org with esmtp (Exim 4.76 #1 (Red Hat Linux)) id 1ToMlE-0005gY-3w for linux-arm-kernel@lists.infradead.org; Thu, 27 Dec 2012 23:21:12 +0000 Received: from localhost.localdomain (unknown [192.168.0.102]) by server.prisktech.co.nz (Postfix) with ESMTP id 1A28BFC0A61; Fri, 28 Dec 2012 12:21:12 +1300 (NZDT) From: Tony Prisk To: Arnd Bergmann , Olof Johansson Subject: [PATCH 2/4] arm: vt8500: Remove single platform Kconfig options Date: Fri, 28 Dec 2012 12:20:50 +1300 Message-Id: <1356650452-16559-3-git-send-email-linux@prisktech.co.nz> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1356650452-16559-1-git-send-email-linux@prisktech.co.nz> References: <1356650452-16559-1-git-send-email-linux@prisktech.co.nz> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20121227_182112_516833_C08989B9 X-CRM114-Status: GOOD ( 13.77 ) X-Spam-Score: -2.6 (--) X-Spam-Report: SpamAssassin version 3.3.2 on merlin.infradead.org summary: Content analysis details: (-2.6 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.7 RP_MATCHES_RCVD Envelope sender domain matches handover relay domain -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] Cc: vt8500-wm8505-linux-kernel@googlegroups.com, Tony Prisk , linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: linux-arm-kernel-bounces@lists.infradead.org Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org This patch completes the move of arch-vt8500 to multiplatform only. The remaining single-image Kconfig options are removed from arch/arm/Kconfig and the options in arch/arm/mach-vt8500/Kconfig are updated. Signed-off-by: Tony Prisk --- arch/arm/Kconfig | 21 --------------------- arch/arm/mach-vt8500/Kconfig | 13 +++---------- 2 files changed, 3 insertions(+), 31 deletions(-) diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index fbb9492..76efd43 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -950,27 +950,6 @@ config ARCH_OMAP help Support for TI's OMAP platform (OMAP1/2/3/4). -config ARCH_VT8500_SINGLE - bool "VIA/WonderMedia 85xx" - select ARCH_VT8500 - select COMMON_CLK - select CPU_ARM926T - select MULTI_IRQ_HANDLER - select SPARSE_IRQ - select USE_OF - help - Support for VIA/WonderMedia VT8500/WM85xx System-on-Chip. - -config ARCH_WM8750_SINGLE - bool "WonderMedia WM8750/WM8850" - select ARCH_VT8500 - select COMMON_CLK - select MULTI_IRQ_HANDLER - select SPARSE_IRQ - select USE_OF - help - Support for WonderMedia WM8750/WM8850 System-on-Chip. - endchoice menu "Multiple platform selection" diff --git a/arch/arm/mach-vt8500/Kconfig b/arch/arm/mach-vt8500/Kconfig index d67c7fa..f466b58 100644 --- a/arch/arm/mach-vt8500/Kconfig +++ b/arch/arm/mach-vt8500/Kconfig @@ -8,9 +8,8 @@ config ARCH_VT8500 select HAVE_CLK config ARCH_WM8505 - bool "VIA/WonderMedia 85xx" if !ARCH_VT8500_SINGLE + bool "VIA/WonderMedia 85xx" depends on ARCH_MULTI_V5 - default ARCH_VT8500_SINGLE select ARCH_VT8500 select CPU_ARM926T help @@ -18,7 +17,7 @@ config ARCH_WM8505 config ARCH_WM8750 bool "WonderMedia WM8750" - depends on ARCH_MULTI_V6 || ARCH_WM8750_SINGLE + depends on ARCH_MULTI_V6 select ARCH_VT8500 select CPU_V6 help @@ -26,14 +25,8 @@ config ARCH_WM8750 config ARCH_WM8850 bool "WonderMedia WM8850" - depends on ARCH_MULTI_V7 || ARCH_WM8750_SINGLE + depends on ARCH_MULTI_V7 select ARCH_VT8500 select CPU_V7 help Support for WonderMedia WM8850 System-on-Chip. - -# ensure that ARCH_WM8850 is on if ARCH_WM8750 is off -config ARCH_WM8850_AUTO - def_bool y - depends on ARCH_WM8750_SINGLE && !ARCH_WM8750 - select ARCH_WM8850