diff mbox

Fix select-induced Kconfig warning for ZBOOT_ROM

Message ID 20140113152011.GA15107@ulmo.nvidia.com (mailing list archive)
State New, archived
Headers show

Commit Message

Thierry Reding Jan. 13, 2014, 3:20 p.m. UTC 
On Mon, Jan 13, 2014 at 01:48:13PM +0000, Russell King - ARM Linux wrote:
> On Mon, Jan 13, 2014 at 12:52:10PM +0100, Thierry Reding wrote:
> > On Wed, Jan 08, 2014 at 09:20:10AM +0100, Arnd Bergmann wrote:
> > > --- a/arch/arm/mach-imx/Kconfig
> > > +++ b/arch/arm/mach-imx/Kconfig
> > > @@ -3,7 +3,7 @@ config ARCH_MXC
> > >         select ARCH_REQUIRE_GPIOLIB
> > >         select ARM_CPU_SUSPEND if PM
> > >         select ARM_PATCH_PHYS_VIRT
> > > -       select AUTO_ZRELADDR if !ZBOOT_ROM
> > > +       select AUTO_ZRELADDR
> > >         select CLKSRC_MMIO
> > >         select COMMON_CLK
> > >         select GENERIC_ALLOCATOR
> > 
> > Hi Arnd,
> > 
> > I haven't seen this go into linux-next yet. Do you plan on sending a
> > patch for this?
> 
> Maybe someone should respond to this comment from Arnd:
> 
> | On second thought, we should just remove the 'select AUTO_ZRELADDR' from
> | ARCH_MXC and everything that is multiplatform enabled, since it's already
> | selected by ARCH_MULTIPLATFORM.
> 
> which I think is the right way to go here.  The ARCH_MXC option is
> hidden when multiplatform is not enabled.  When it is enabled,
> AUTO_ZRELADDR is selected by the multiplatform option.  So having a
> "select AUTO_ZRELADDR" of any kind under ARCH_MXC is entirely
> redundant.

It looks like ARCH_MXC is the only one that matches Arnd's requirements.
All other platforms that select AUTO_ZRELADDR seem to not support multi-
platform.

Below is a patch to remove the line completely. Shall I post that to the
patch tracker?

Thierry

Comments

Arnd Bergmann Jan. 13, 2014, 3:24 p.m. UTC | #1 
On Monday 13 January 2014, Thierry Reding wrote:
> From ee1347c28bb7cb56a3c178321253e38de4bbc676 Mon Sep 17 00:00:00 2001
> From: Thierry Reding <treding@nvidia.com>
> Date: Fri, 10 Jan 2014 17:12:07 +0100
> Subject: [PATCH] ARM: Remove redundant select AUTO_ZRELADDR
> 
> ARCH_MXC depends on ARCH_MULTI_V4_V5 or ARCH_MULTI_V6_V7, both of which
> can only be enabled when ARCH_MULTIPLATFORM is selected. If so, then the
> AUTO_ZRELADDR will already be selected.
> 
> Removing the selection of AUTO_ZRELADDR from ARCH_MXC has the additional
> benefit of getting rid of the following Kconfig error:
> 
>         arch/arm/Kconfig:1965:error: recursive dependency detected!
>         arch/arm/Kconfig:1965:  symbol ZBOOT_ROM depends on AUTO_ZRELADDR
>         arch/arm/Kconfig:2153:  symbol AUTO_ZRELADDR is selected by ZBOOT_ROM
> 
> Suggested-by: Arnd Bergmann <arnd@arndb.de>
> Signed-off-by: Thierry Reding <treding@nvidia.com>

Acked-by: Arnd Bergmann <arnd@arndb.de>

I'm not sure through which tree this needs to go to make sure that 
both the arm-soc tree and rmk's arm tree are correct by themselves
as well as when they get merged.

	Arnd
Thierry Reding Jan. 15, 2014, 8:56 a.m. UTC | #2 
On Mon, Jan 13, 2014 at 04:24:07PM +0100, Arnd Bergmann wrote:
> On Monday 13 January 2014, Thierry Reding wrote:
> > From ee1347c28bb7cb56a3c178321253e38de4bbc676 Mon Sep 17 00:00:00 2001
> > From: Thierry Reding <treding@nvidia.com>
> > Date: Fri, 10 Jan 2014 17:12:07 +0100
> > Subject: [PATCH] ARM: Remove redundant select AUTO_ZRELADDR
> > 
> > ARCH_MXC depends on ARCH_MULTI_V4_V5 or ARCH_MULTI_V6_V7, both of which
> > can only be enabled when ARCH_MULTIPLATFORM is selected. If so, then the
> > AUTO_ZRELADDR will already be selected.
> > 
> > Removing the selection of AUTO_ZRELADDR from ARCH_MXC has the additional
> > benefit of getting rid of the following Kconfig error:
> > 
> >         arch/arm/Kconfig:1965:error: recursive dependency detected!
> >         arch/arm/Kconfig:1965:  symbol ZBOOT_ROM depends on AUTO_ZRELADDR
> >         arch/arm/Kconfig:2153:  symbol AUTO_ZRELADDR is selected by ZBOOT_ROM
> > 
> > Suggested-by: Arnd Bergmann <arnd@arndb.de>
> > Signed-off-by: Thierry Reding <treding@nvidia.com>
> 
> Acked-by: Arnd Bergmann <arnd@arndb.de>
> 
> I'm not sure through which tree this needs to go to make sure that 
> both the arm-soc tree and rmk's arm tree are correct by themselves
> as well as when they get merged.

The original patch went into the arm tree, so I suppose arm-soc isn't
really impacted by this unless merged with the arm tree. Therefore I
think if this goes in via Russell's tree it should be fine.

Thierry
diff mbox

Patch

From ee1347c28bb7cb56a3c178321253e38de4bbc676 Mon Sep 17 00:00:00 2001
From: Thierry Reding <treding@nvidia.com>
Date: Fri, 10 Jan 2014 17:12:07 +0100
Subject: [PATCH] ARM: Remove redundant select AUTO_ZRELADDR

ARCH_MXC depends on ARCH_MULTI_V4_V5 or ARCH_MULTI_V6_V7, both of which
can only be enabled when ARCH_MULTIPLATFORM is selected. If so, then the
AUTO_ZRELADDR will already be selected.

Removing the selection of AUTO_ZRELADDR from ARCH_MXC has the additional
benefit of getting rid of the following Kconfig error:

	arch/arm/Kconfig:1965:error: recursive dependency detected!
	arch/arm/Kconfig:1965:  symbol ZBOOT_ROM depends on AUTO_ZRELADDR
	arch/arm/Kconfig:2153:  symbol AUTO_ZRELADDR is selected by ZBOOT_ROM

Suggested-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Thierry Reding <treding@nvidia.com>
---
 arch/arm/mach-imx/Kconfig | 1 -
 1 file changed, 1 deletion(-)

diff --git a/arch/arm/mach-imx/Kconfig b/arch/arm/mach-imx/Kconfig
index b0c6eb35a322..33567aa5880f 100644
--- a/arch/arm/mach-imx/Kconfig
+++ b/arch/arm/mach-imx/Kconfig
@@ -3,7 +3,6 @@  config ARCH_MXC
 	select ARCH_REQUIRE_GPIOLIB
 	select ARM_CPU_SUSPEND if PM
 	select ARM_PATCH_PHYS_VIRT
-	select AUTO_ZRELADDR if !ZBOOT_ROM
 	select CLKSRC_MMIO
 	select COMMON_CLK
 	select GENERIC_ALLOCATOR
-- 
1.8.4.2