Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751007AbaDOJ11 (ORCPT ); Tue, 15 Apr 2014 05:27:27 -0400 Received: from mx08-00178001.pphosted.com ([91.207.212.93]:41072 "EHLO mx08-00178001.pphosted.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751305AbaDOJ1Y (ORCPT ); Tue, 15 Apr 2014 05:27:24 -0400 Message-ID: <534CFB45.9070704@st.com> Date: Tue, 15 Apr 2014 14:56:29 +0530 From: Rajeev kumar User-Agent: Mozilla/5.0 (Windows NT 6.1; WOW64; rv:24.0) Gecko/20100101 Thunderbird/24.4.0 MIME-Version: 1.0 To: Paul Bolle , Viresh Kumar , Russell King Cc: Martin Walch , Richard Weinberger , spear-devel , "linux-arm-kernel@lists.infradead.org" , "linux-kernel@vger.kernel.org" Subject: Re: [PATCH v2] ARM: spear: Remove references to PLAT_SPEAR_SINGLE References: <1392153676.14317.8.camel@x220> <1397550407.1985.12.camel@x220> In-Reply-To: <1397550407.1985.12.camel@x220> Content-Type: text/plain; charset="UTF-8"; format=flowed Content-Transfer-Encoding: 7bit X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10432:5.11.96,1.0.14,0.0.0000 definitions=2014-04-14_01:2014-04-14,2014-04-14,1970-01-01 signatures=0 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 4/15/2014 1:56 PM, Paul Bolle wrote: > The Kconfig symbol PLAT_SPEAR_SINGLE briefly appeared during the v3.10 > development cycle. It was removed in a merge commit before v3.10. A few > references to it were left in the tree, probably because they didn't > generate merge conflicts. Whatever it was, they're useless now and can > safely be removed. > > Reported-by: Martin Walch > Signed-off-by: Paul Bolle > --- > 0) First version was broken: it left config ARCH_SPEAR_AUTO without its > bool type. This version is done on top of v3.15-rc1. > > 1) Still untested. > > arch/arm/mach-spear/Kconfig | 9 ++++----- > 1 file changed, 4 insertions(+), 5 deletions(-) > > diff --git a/arch/arm/mach-spear/Kconfig b/arch/arm/mach-spear/Kconfig > index 0786249b2832..bc8a11c53377 100644 > --- a/arch/arm/mach-spear/Kconfig > +++ b/arch/arm/mach-spear/Kconfig > @@ -4,7 +4,6 @@ > > menuconfig PLAT_SPEAR > bool "ST SPEAr Family" if ARCH_MULTI_V7 || ARCH_MULTI_V5 > - default PLAT_SPEAR_SINGLE > select ARCH_REQUIRE_GPIOLIB > select ARM_AMBA > select CLKSRC_MMIO > @@ -13,7 +12,7 @@ if PLAT_SPEAR > > config ARCH_SPEAR13XX > bool "ST SPEAr13xx" > - depends on ARCH_MULTI_V7 || PLAT_SPEAR_SINGLE > + depends on ARCH_MULTI_V7 > select ARCH_HAS_CPUFREQ > select ARM_GIC > select GPIO_SPEAR_SPICS > @@ -41,7 +40,7 @@ endif #ARCH_SPEAR13XX > > config ARCH_SPEAR3XX > bool "ST SPEAr3xx" > - depends on ARCH_MULTI_V5 || PLAT_SPEAR_SINGLE > + depends on ARCH_MULTI_V5 > depends on !ARCH_SPEAR13XX > select ARM_VIC > select PINCTRL > @@ -72,7 +71,7 @@ endif > > config ARCH_SPEAR6XX > bool "ST SPEAr6XX" > - depends on ARCH_MULTI_V5 || PLAT_SPEAR_SINGLE > + depends on ARCH_MULTI_V5 > depends on !ARCH_SPEAR13XX > select ARM_VIC > help > @@ -85,7 +84,7 @@ config MACH_SPEAR600 > Supports ST SPEAr600 boards configured via the device-tree > > config ARCH_SPEAR_AUTO > - def_bool PLAT_SPEAR_SINGLE > + bool > depends on !ARCH_SPEAR13XX && !ARCH_SPEAR6XX > select ARCH_SPEAR3XX > > Reviewed-by: Rajeev Kumar -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/