* [PATCH] ARM: omap: fix Kconfig warning
@ 2014-09-08 15:00 Arnd Bergmann
2014-09-08 15:34 ` Tony Lindgren
0 siblings, 1 reply; 4+ messages in thread
From: Arnd Bergmann @ 2014-09-08 15:00 UTC (permalink / raw)
To: linux-arm-kernel
A small mistake during the recent Kconfig cleanup has led
to a harmless warning for OMAP1:
warning: (ARCH_OMAP1) selects ARCH_OMAP which has unmet direct dependencies (ARCH_MULTI_V6 || ARCH_MULTI_V7)
We can easily avoid that by moving the ARCH_OMAP symbol outside of the
OMAP2 submenu.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
diff --git a/arch/arm/mach-omap2/Kconfig b/arch/arm/mach-omap2/Kconfig
index e7189dcc9309..30d787e99e1a 100644
--- a/arch/arm/mach-omap2/Kconfig
+++ b/arch/arm/mach-omap2/Kconfig
@@ -1,9 +1,9 @@
-menu "TI OMAP/AM/DM/DRA Family"
- depends on ARCH_MULTI_V6 || ARCH_MULTI_V7
-
config ARCH_OMAP
bool
+menu "TI OMAP/AM/DM/DRA Family"
+ depends on ARCH_MULTI_V6 || ARCH_MULTI_V7
+
config ARCH_OMAP2
bool "TI OMAP2"
depends on ARCH_MULTI_V6
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [PATCH] ARM: omap: fix Kconfig warning
2014-09-08 15:00 [PATCH] ARM: omap: fix Kconfig warning Arnd Bergmann
@ 2014-09-08 15:34 ` Tony Lindgren
2014-09-08 18:16 ` Arnd Bergmann
0 siblings, 1 reply; 4+ messages in thread
From: Tony Lindgren @ 2014-09-08 15:34 UTC (permalink / raw)
To: linux-arm-kernel
* Arnd Bergmann <arnd@arndb.de> [140908 08:01]:
> A small mistake during the recent Kconfig cleanup has led
> to a harmless warning for OMAP1:
>
> warning: (ARCH_OMAP1) selects ARCH_OMAP which has unmet direct dependencies (ARCH_MULTI_V6 || ARCH_MULTI_V7)
>
> We can easily avoid that by moving the ARCH_OMAP symbol outside of the
> OMAP2 submenu.
OK I made a similar patch, but I moved it into plat-omap/Kconfig
as it's also used by omap1. The regression was probably caused by
commit 21278aeafbfa (ARM: use menuconfig for sub-arch menus).
If that works for you, I'll verify the regression causing commit
and post it with a description.
Regards,
Tony
--- a/arch/arm/mach-omap2/Kconfig
+++ b/arch/arm/mach-omap2/Kconfig
@@ -1,9 +1,6 @@
menu "TI OMAP/AM/DM/DRA Family"
depends on ARCH_MULTI_V6 || ARCH_MULTI_V7
-config ARCH_OMAP
- bool
-
config ARCH_OMAP2
bool "TI OMAP2"
depends on ARCH_MULTI_V6
--- a/arch/arm/plat-omap/Kconfig
+++ b/arch/arm/plat-omap/Kconfig
@@ -1,3 +1,6 @@
+config ARCH_OMAP
+ bool
+
if ARCH_OMAP
menu "TI OMAP Common Features"
^ permalink raw reply [flat|nested] 4+ messages in thread
* [PATCH] ARM: omap: fix Kconfig warning
2014-09-08 15:34 ` Tony Lindgren
@ 2014-09-08 18:16 ` Arnd Bergmann
2014-09-08 21:29 ` Tony Lindgren
0 siblings, 1 reply; 4+ messages in thread
From: Arnd Bergmann @ 2014-09-08 18:16 UTC (permalink / raw)
To: linux-arm-kernel
On Monday 08 September 2014 08:34:00 Tony Lindgren wrote:
> * Arnd Bergmann <arnd@arndb.de> [140908 08:01]:
> > A small mistake during the recent Kconfig cleanup has led
> > to a harmless warning for OMAP1:
> >
> > warning: (ARCH_OMAP1) selects ARCH_OMAP which has unmet direct dependencies (ARCH_MULTI_V6 || ARCH_MULTI_V7)
> >
> > We can easily avoid that by moving the ARCH_OMAP symbol outside of the
> > OMAP2 submenu.
>
> OK I made a similar patch, but I moved it into plat-omap/Kconfig
> as it's also used by omap1. The regression was probably caused by
> commit 21278aeafbfa (ARM: use menuconfig for sub-arch menus).
>
> If that works for you, I'll verify the regression causing commit
> and post it with a description.
Yes, sounds good. Your version is better than mind.
Arnd
>
> --- a/arch/arm/mach-omap2/Kconfig
> +++ b/arch/arm/mach-omap2/Kconfig
> @@ -1,9 +1,6 @@
> menu "TI OMAP/AM/DM/DRA Family"
> depends on ARCH_MULTI_V6 || ARCH_MULTI_V7
>
> -config ARCH_OMAP
> - bool
> -
> config ARCH_OMAP2
> bool "TI OMAP2"
> depends on ARCH_MULTI_V6
> --- a/arch/arm/plat-omap/Kconfig
> +++ b/arch/arm/plat-omap/Kconfig
> @@ -1,3 +1,6 @@
> +config ARCH_OMAP
> + bool
> +
> if ARCH_OMAP
>
> menu "TI OMAP Common Features"
^ permalink raw reply [flat|nested] 4+ messages in thread
* [PATCH] ARM: omap: fix Kconfig warning
2014-09-08 18:16 ` Arnd Bergmann
@ 2014-09-08 21:29 ` Tony Lindgren
0 siblings, 0 replies; 4+ messages in thread
From: Tony Lindgren @ 2014-09-08 21:29 UTC (permalink / raw)
To: linux-arm-kernel
* Arnd Bergmann <arnd@arndb.de> [140908 11:17]:
> On Monday 08 September 2014 08:34:00 Tony Lindgren wrote:
> > * Arnd Bergmann <arnd@arndb.de> [140908 08:01]:
> > > A small mistake during the recent Kconfig cleanup has led
> > > to a harmless warning for OMAP1:
> > >
> > > warning: (ARCH_OMAP1) selects ARCH_OMAP which has unmet direct dependencies (ARCH_MULTI_V6 || ARCH_MULTI_V7)
> > >
> > > We can easily avoid that by moving the ARCH_OMAP symbol outside of the
> > > OMAP2 submenu.
> >
> > OK I made a similar patch, but I moved it into plat-omap/Kconfig
> > as it's also used by omap1. The regression was probably caused by
> > commit 21278aeafbfa (ARM: use menuconfig for sub-arch menus).
> >
> > If that works for you, I'll verify the regression causing commit
> > and post it with a description.
>
> Yes, sounds good. Your version is better than mind.
OK here's the patch again with breaking commit and reported by.
Regards,
Tony
8< -------------
From: Tony Lindgren <tony@atomide.com>
Date: Mon, 8 Sep 2014 07:52:11 -0700
Subject: [PATCH] ARM: OMAP: Fix Kconfig warning for omap1
Commit 21278aeafbfa ("ARM: use menuconfig for sub-arch menus") improved
the sub-arch menus, but accidentally caused new warnings for omap1.
This was because the commit added a menu entry around config ARCH_OMAP
bool entry where the menu had depends on ARCH_MULTI_V6 || ARCH_MULTI_V7.
As ARCH_OMAP is shared between omap1 and omap2plus, let's fix the
issue by defining ARCH_OMAP in the shared plat-omap/Kconfig.
Fixes: 21278aeafbfa ("ARM: use menuconfig for sub-arch menus")
Reported-by: Andreas Ruprecht <rupran@einserver.de>
Cc: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Tony Lindgren <tony@atomide.com>
--- a/arch/arm/mach-omap2/Kconfig
+++ b/arch/arm/mach-omap2/Kconfig
@@ -1,9 +1,6 @@
menu "TI OMAP/AM/DM/DRA Family"
depends on ARCH_MULTI_V6 || ARCH_MULTI_V7
-config ARCH_OMAP
- bool
-
config ARCH_OMAP2
bool "TI OMAP2"
depends on ARCH_MULTI_V6
diff --git a/arch/arm/plat-omap/Kconfig b/arch/arm/plat-omap/Kconfig
index 02fc10d..d055db3 100644
--- a/arch/arm/plat-omap/Kconfig
+++ b/arch/arm/plat-omap/Kconfig
@@ -1,3 +1,6 @@
+config ARCH_OMAP
+ bool
+
if ARCH_OMAP
menu "TI OMAP Common Features"
^ permalink raw reply related [flat|nested] 4+ messages in thread
end of thread, other threads:[~2014-09-08 21:29 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-09-08 15:00 [PATCH] ARM: omap: fix Kconfig warning Arnd Bergmann
2014-09-08 15:34 ` Tony Lindgren
2014-09-08 18:16 ` Arnd Bergmann
2014-09-08 21:29 ` Tony Lindgren
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).