Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932716AbcDFEa7 (ORCPT ); Wed, 6 Apr 2016 00:30:59 -0400 Received: from devils.ext.ti.com ([198.47.26.153]:59206 "EHLO devils.ext.ti.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932146AbcDFEa5 (ORCPT ); Wed, 6 Apr 2016 00:30:57 -0400 Subject: Re: [PATCH v2] arm: omap2: remove redundant multiplatform checks To: Jonas Rabenstein , , References: <201604060526.ouhQYqrT%fengguang.wu@intel.com> <1459895738-6546-1-git-send-email-jonas.rabenstein@studium.uni-erlangen.de> CC: , , From: Lokesh Vutla Message-ID: <57048FE3.30909@ti.com> Date: Wed, 6 Apr 2016 09:56:11 +0530 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:38.0) Gecko/20100101 Thunderbird/38.3.0 MIME-Version: 1.0 In-Reply-To: <1459895738-6546-1-git-send-email-jonas.rabenstein@studium.uni-erlangen.de> Content-Type: text/plain; charset="windows-1252" Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 3377 Lines: 132 On Wednesday 06 April 2016 04:05 AM, Jonas Rabenstein wrote: > The directory arch/arm/mach-omap2 is only selected for compilation if > CONFIG_ARCH_OMAP2PLUS is selected. CONFIG_ARCH_OMAP2PLUS itself is a > silent option and all machines selecting this option are multiplatform > devices. As a consequence checks for CONFIG_ARCH_MULTIPLATFORM as well > as CONFIG_ARCH_OMAP2PLUS within that directory are superfluous and can > be removed. > > Signed-off-by: Jonas Rabenstein > --- > changes in v2: > * missed two #endif's > > arch/arm/mach-omap2/Makefile | 2 +- > arch/arm/mach-omap2/soc.h | 121 +++---------------------------------------- > 2 files changed, 8 insertions(+), 115 deletions(-) > > diff --git a/arch/arm/mach-omap2/Makefile b/arch/arm/mach-omap2/Makefile > index 0ba6a0e..04e276c 100644 > --- a/arch/arm/mach-omap2/Makefile > +++ b/arch/arm/mach-omap2/Makefile > @@ -2,7 +2,7 @@ > # Makefile for the linux kernel. > # > > -ccflags-$(CONFIG_ARCH_MULTIPLATFORM) := -I$(srctree)/$(src)/include \ > +ccflags-y := -I$(srctree)/$(src)/include \ > -I$(srctree)/arch/arm/plat-omap/include > > # Common support > diff --git a/arch/arm/mach-omap2/soc.h b/arch/arm/mach-omap2/soc.h > index 364418c..79f1573 100644 > --- a/arch/arm/mach-omap2/soc.h > +++ b/arch/arm/mach-omap2/soc.h > @@ -42,79 +42,7 @@ > * Test if multicore OMAP support is needed > */ > #undef MULTI_OMAP2 > -#undef OMAP_NAME > - > -#ifdef CONFIG_ARCH_MULTIPLATFORM > #define MULTI_OMAP2 > -#endif > -#ifdef CONFIG_SOC_OMAP2420 > -# ifdef OMAP_NAME > -# undef MULTI_OMAP2 > -# define MULTI_OMAP2 > -# else > -# define OMAP_NAME omap2420 > -# endif > -#endif > -#ifdef CONFIG_SOC_OMAP2430 > -# ifdef OMAP_NAME > -# undef MULTI_OMAP2 > -# define MULTI_OMAP2 > -# else > -# define OMAP_NAME omap2430 > -# endif > -#endif > -#ifdef CONFIG_ARCH_OMAP3 > -# ifdef OMAP_NAME > -# undef MULTI_OMAP2 > -# define MULTI_OMAP2 > -# else > -# define OMAP_NAME omap3 > -# endif > -#endif > -#ifdef CONFIG_ARCH_OMAP4 > -# ifdef OMAP_NAME > -# undef MULTI_OMAP2 > -# define MULTI_OMAP2 > -# else > -# define OMAP_NAME omap4 > -# endif > -#endif > - > -#ifdef CONFIG_SOC_OMAP5 > -# ifdef OMAP_NAME > -# undef MULTI_OMAP2 > -# define MULTI_OMAP2 > -# else > -# define OMAP_NAME omap5 > -# endif > -#endif > - > -#ifdef CONFIG_SOC_AM33XX > -# ifdef OMAP_NAME > -# undef MULTI_OMAP2 > -# define MULTI_OMAP2 > -# else > -# define OMAP_NAME am33xx > -# endif > -#endif > - > -#ifdef CONFIG_SOC_AM43XX > -# ifdef OMAP_NAME > -# undef MULTI_OMAP2 > -# define MULTI_OMAP2 > -# else > -# define OMAP_NAME am43xx > -# endif > -#endif > - > -#ifdef CONFIG_SOC_DRA7XX > -# ifdef OMAP_NAME > -# undef MULTI_OMAP2 > -# define MULTI_OMAP2 > -# else > -# define OMAP_NAME DRA7XX > -# endif > -#endif > > /* > * Omap device type i.e. EMU/HS/TST/GP/BAD > @@ -242,11 +170,6 @@ IS_AM_SUBCLASS(437x, 0x437) > IS_DRA_SUBCLASS(75x, 0x75) > IS_DRA_SUBCLASS(72x, 0x72) > > -#define soc_is_omap24xx() 0 > -#define soc_is_omap242x() 0 > -#define soc_is_omap243x() 0 > -#define soc_is_omap34xx() 0 > -#define soc_is_omap343x() 0 Why are you deleting these definitions. Without these I am sure there will be a build error when you don't select ARCH_OMAP2 or ARCH_OMAP3 and building with omap2plus_defconfig. Thanks and regards, Lokesh