Skip to content

Commit

Permalink
ARM: OMAP: Fix Kconfig warning for omap1
Browse files Browse the repository at this point in the history
Commit 21278ae ("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: 21278ae ("ARM: use menuconfig for sub-arch menus")
Reported-by: Andreas Ruprecht <rupran@einserver.de>
Signed-off-by: Tony Lindgren <tony@atomide.com>
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
  • Loading branch information
tmlind authored and arndb committed Sep 9, 2014
1 parent 2ce7598 commit 52aaac5
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
3 changes: 0 additions & 3 deletions arch/arm/mach-omap2/Kconfig
Original file line number Diff line number Diff line change
@@ -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
Expand Down
3 changes: 3 additions & 0 deletions arch/arm/plat-omap/Kconfig
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
config ARCH_OMAP
bool

if ARCH_OMAP

menu "TI OMAP Common Features"
Expand Down

0 comments on commit 52aaac5

Please sign in to comment.