Commit 4b0ed696 authored by Arnd Bergmann's avatar Arnd Bergmann

ARM: OMAP2+: add dependencies on ARCH_MULTI_V6/V7

CONFIG_ARCH_OMAP2PLUS depends on (ARCH_MULTI_V6 || ARCH_MULTI_V7) as of
a0694861 "ARM: OMAP2+: Enable ARCH_MULTIPLATFORM support", but the
individual OMAP2/3/4/5 and AM33XX platforms can all be selected independent
of what we are building for, which is a bug and prevents us from easily
building e.g. an ARMv7-only defconfig.

This makes ARCH_OMAP2 depend on ARCH_MULTI_V6 and the others depend on
ARCH_MULTI_V7, to ensure we really only build the platforms for the
CPUs we have enabled in the global multiplatform configuration step.

Cc: Ezequiel Garcia <ezequiel.garcia@free-electrons.com>
Acked-by: default avatarTony Lindgren <tony@atomide.com>
Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parent c312908a
...@@ -55,6 +55,7 @@ config SOC_HAS_REALTIME_COUNTER ...@@ -55,6 +55,7 @@ config SOC_HAS_REALTIME_COUNTER
config ARCH_OMAP2 config ARCH_OMAP2
bool "TI OMAP2" bool "TI OMAP2"
depends on ARCH_OMAP2PLUS depends on ARCH_OMAP2PLUS
depends on ARCH_MULTI_V6
default y default y
select CPU_V6 select CPU_V6
select MULTI_IRQ_HANDLER select MULTI_IRQ_HANDLER
...@@ -64,6 +65,7 @@ config ARCH_OMAP2 ...@@ -64,6 +65,7 @@ config ARCH_OMAP2
config ARCH_OMAP3 config ARCH_OMAP3
bool "TI OMAP3" bool "TI OMAP3"
depends on ARCH_OMAP2PLUS depends on ARCH_OMAP2PLUS
depends on ARCH_MULTI_V7
default y default y
select ARCH_HAS_OPP select ARCH_HAS_OPP
select ARM_CPU_SUSPEND if PM select ARM_CPU_SUSPEND if PM
...@@ -80,6 +82,7 @@ config ARCH_OMAP4 ...@@ -80,6 +82,7 @@ config ARCH_OMAP4
bool "TI OMAP4" bool "TI OMAP4"
default y default y
depends on ARCH_OMAP2PLUS depends on ARCH_OMAP2PLUS
depends on ARCH_MULTI_V7
select ARCH_HAS_OPP select ARCH_HAS_OPP
select ARCH_NEEDS_CPU_IDLE_COUPLED if SMP select ARCH_NEEDS_CPU_IDLE_COUPLED if SMP
select ARM_CPU_SUSPEND if PM select ARM_CPU_SUSPEND if PM
...@@ -99,6 +102,7 @@ config ARCH_OMAP4 ...@@ -99,6 +102,7 @@ config ARCH_OMAP4
config SOC_OMAP5 config SOC_OMAP5
bool "TI OMAP5" bool "TI OMAP5"
depends on ARCH_MULTI_V7
select ARM_CPU_SUSPEND if PM select ARM_CPU_SUSPEND if PM
select ARM_GIC select ARM_GIC
select CPU_V7 select CPU_V7
...@@ -135,6 +139,7 @@ config SOC_TI81XX ...@@ -135,6 +139,7 @@ config SOC_TI81XX
config SOC_AM33XX config SOC_AM33XX
bool "AM33XX support" bool "AM33XX support"
depends on ARCH_MULTI_V7
default y default y
select ARM_CPU_SUSPEND if PM select ARM_CPU_SUSPEND if PM
select CPU_V7 select CPU_V7
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment