From patchwork Thu Nov 10 00:07:15 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kyle Moffett X-Patchwork-Id: 124761 Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from ozlabs.org (localhost [IPv6:::1]) by ozlabs.org (Postfix) with ESMTP id 0C03E101647 for ; Thu, 10 Nov 2011 11:12:16 +1100 (EST) Received: from border.exmeritus.com (border.exmeritus.com [IPv6:2002:46a7:f11a:ffff::]) by ozlabs.org (Postfix) with ESMTP id 2D8E5101502 for ; Thu, 10 Nov 2011 11:09:19 +1100 (EST) Received: from ysera.exmeritus.com (firewall2.exmeritus.com [10.13.38.2]) by border.exmeritus.com (Postfix) with ESMTP id 57EFBAC09D; Wed, 9 Nov 2011 19:09:17 -0500 (EST) From: Kyle Moffett To: linuxppc-dev@lists.ozlabs.org Subject: [RFC PATCH 17/17] powerpc/e500: Finally remove "CONFIG_E500" Date: Wed, 9 Nov 2011 19:07:15 -0500 Message-Id: <1320883635-17194-18-git-send-email-Kyle.D.Moffett@boeing.com> X-Mailer: git-send-email 1.7.2.5 In-Reply-To: <4E42AB6F.1050900@freescale.com> References: <4E42AB6F.1050900@freescale.com> Cc: Baruch Siach , Sonny Rao , Timur Tabi , linux-kernel@vger.kernel.org, Paul Gortmaker , Paul Mackerras , Kyle Moffett , Scott Wood , Paul Bolle X-BeenThere: linuxppc-dev@lists.ozlabs.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: Linux on PowerPC Developers Mail List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: linuxppc-dev-bounces+patchwork-incoming=ozlabs.org@lists.ozlabs.org Sender: linuxppc-dev-bounces+patchwork-incoming=ozlabs.org@lists.ozlabs.org This ambiguous config option is now only present as a Kconfig stub. Remove it and fix up the users. Signed-off-by: Kyle Moffett --- arch/powerpc/platforms/Kconfig.cputype | 10 ++++------ 1 files changed, 4 insertions(+), 6 deletions(-) diff --git a/arch/powerpc/platforms/Kconfig.cputype b/arch/powerpc/platforms/Kconfig.cputype index 22df19d..d4faa6f 100644 --- a/arch/powerpc/platforms/Kconfig.cputype +++ b/arch/powerpc/platforms/Kconfig.cputype @@ -32,14 +32,16 @@ config FSL_E200 config FSL_E500_V1_V2 bool "Freescale e500v1/e500v2 (also known as MPC85xx)" select PHYS_64BIT_SUPPORTED - select E500 + select FSL_EMB_PERFMON + select PPC_FSL_BOOK3E select PPC_85xx config FSL_E500MC bool "Freescale e500mc (also e5500 in 32-bit mode)" select PHYS_64BIT_SUPPORTED select PPC_FPU - select E500 + select FSL_EMB_PERFMON + select PPC_FSL_BOOK3E select PPC_85xx config PPC_8xx @@ -146,12 +148,8 @@ config PPC_85xx config FSL_E5500 bool - select E500 - -config E500 select FSL_EMB_PERFMON select PPC_FSL_BOOK3E - bool config PPC_FPU bool