From: Lokesh Vutla <a0131933@ti.com>
To: Jonas Rabenstein <jonas.rabenstein@studium.uni-erlangen.de>,
<linux@arm.linux.org.uk>, <tony@atomide.com>
Cc: <linux-omap@vger.kernel.org>,
<linux-arm-kernel@lists.infradead.org>,
<linux-kernel@vger.kernel.org>
Subject: Re: [PATCH v2] arm: omap2: remove redundant multiplatform checks
Date: Wed, 6 Apr 2016 09:56:11 +0530 [thread overview]
Message-ID: <57048FE3.30909@ti.com> (raw)
In-Reply-To: <1459895738-6546-1-git-send-email-jonas.rabenstein@studium.uni-erlangen.de>
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 <jonas.rabenstein@studium.uni-erlangen.de>
> ---
> 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
next prev parent reply other threads:[~2016-04-06 4:30 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-04-05 20:09 [PATCH] arm: omap2: remove redundant multiplatform checks Jonas Rabenstein
2016-04-05 21:49 ` kbuild test robot
2016-04-05 22:35 ` [PATCH v2] " Jonas Rabenstein
2016-04-06 0:05 ` kbuild test robot
2016-04-06 4:26 ` Lokesh Vutla [this message]
2016-04-06 8:14 ` [PATCH v3] " Jonas Rabenstein
2016-04-06 8:45 ` Lokesh Vutla
2016-04-06 19:14 ` Tony Lindgren
2016-04-13 21:07 ` Tony Lindgren
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=57048FE3.30909@ti.com \
--to=a0131933@ti.com \
--cc=jonas.rabenstein@studium.uni-erlangen.de \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-omap@vger.kernel.org \
--cc=linux@arm.linux.org.uk \
--cc=tony@atomide.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).