summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorArnd Bergmann <arnd@arndb.de>2011-06-06 13:04:29 +0000
committerMathieu J. Poirier <mpoirier@peartreecs.com>2012-03-20 15:07:18 -0600
commit7ffa4ac7edfd2537a1ff570c96b38c6287e203f8 (patch)
tree58d5f1dd240a13aa4c5604a822544e66c9c006ab
parentf869fdcaea50005bb78ffbb41acee7db3f5912d9 (diff)
omap2plus: ensure that one of omap2/3/4 is selected
Random configurations can fail if none of the omap families in mach-omap2 is selected. This patch automatically selects omap2 if the user has not made any other choice. Signed-off-by: Arnd Bergmann <arnd@arndb.de> Signed-off-by: Mathieu Poirier <mathieu.poirier@linaro.org> Acked-by: Santosh Shilimkar <santosh.shilimkar@ti.com> Acked-by: Tony Lindgren <tony@atomide.com>
-rw-r--r--arch/arm/mach-omap2/Kconfig10
1 files changed, 10 insertions, 0 deletions
diff --git a/arch/arm/mach-omap2/Kconfig b/arch/arm/mach-omap2/Kconfig
index 0279e9ee7023..b244e805d611 100644
--- a/arch/arm/mach-omap2/Kconfig
+++ b/arch/arm/mach-omap2/Kconfig
@@ -55,6 +55,16 @@ config ARCH_OMAP4
select USB_ARCH_HAS_EHCI
select ARM_CPU_SUSPEND if PM
+config ARCH_OMAP2_AUTO
+ bool
+ depends on !ARCH_OMAP3 && !ARCH_OMAP4
+ select ARCH_OMAP2
+ default y
+ help
+ At least one of OMAP2/OMAP3/OMAP4 needs to be enabled, this
+ selects OMAP2 if nothing else gets selected, to avoid non-building
+ configurations.
+
comment "OMAP Core Type"
depends on ARCH_OMAP2