Skip to contentSkip to conversation

ARM: omap: fix Kconfig warning

PATCH New Arnd Bergmann 2 participants 4 messages Sep 8, 2014

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 ARM: omap: fix Kconfig warning

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.

arch/arm/mach-omap2/Kconfig +3 -3
index e7189dcc9309..30d787e99e1a 100644
@@ -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
maintainer
#1 lore raw

PATCH 1/1 ARM: omap: fix Kconfig warning

Quoted 7 lines · Arnd Bergmann

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

arch/arm/mach-omap2/Kconfig +0 -3
@@ -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
arch/arm/plat-omap/Kconfig +3 -0
@@ -1,3 +1,6 @@
+config ARCH_OMAP
+	bool
+
 if ARCH_OMAP
 
 menu "TI OMAP Common Features"
#2 lore raw

PATCH 1/1 ARM: omap: fix Kconfig warning

Quoted 9 lines · On Monday 08 September 2014 08:34:00 Tony Lindgren wrote:
Quoted 7 lines · Arnd Bergmann

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.

Quoted 6 lines

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

Quoted 22 lines
arch/arm/mach-omap2/Kconfig +0 -3
@@ -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
arch/arm/plat-omap/Kconfig +3 -0
@@ -1,3 +1,6 @@
+config ARCH_OMAP
+	bool
+
 if ARCH_OMAP
 
 menu "TI OMAP Common Features"
maintainer
#3 lore raw

PATCH 1/1 ARM: omap: fix Kconfig warning

Quoted 10 lines · Arnd Bergmann
Quoted 9 lines · On Monday 08 September 2014 08:34:00 Tony Lindgren wrote:
Quoted 7 lines · Arnd Bergmann

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.

Quoted 8 lines
Quoted 6 lines

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 <[email protected]>
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")
Cc Arnd Bergmann <[email protected]>
arch/arm/mach-omap2/Kconfig +0 -3
@@ -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
arch/arm/plat-omap/Kconfig +3 -0
index 02fc10d..d055db3 100644
@@ -1,3 +1,6 @@
+config ARCH_OMAP
+	bool
+
 if ARCH_OMAP
 
 menu "TI OMAP Common Features"