| Message ID | 1366734653-488286-6-git-send-email-arnd@arndb.de (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
* Arnd Bergmann <arnd@arndb.de> [130423 09:36]: > 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. > > Signed-off-by: Arnd Bergmann <arnd@arndb.de> > Cc: Ezequiel Garcia <ezequiel.garcia@free-electrons.com> Acked-by: Tony Lindgren <tony@atomide.com>
On Tuesday 23 April 2013, Tony Lindgren wrote: > * Arnd Bergmann <arnd@arndb.de> [130423 09:36]: > > 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. > > > > Signed-off-by: Arnd Bergmann <arnd@arndb.de> > > Cc: Ezequiel Garcia <ezequiel.garcia@free-electrons.com> > > Acked-by: Tony Lindgren <tony@atomide.com> > Thanks, I've now applied it to the next/fixes-non-critical branch. Arnd
diff --git a/arch/arm/mach-omap2/Kconfig b/arch/arm/mach-omap2/Kconfig index 8111cd9..552341d 100644 --- a/arch/arm/mach-omap2/Kconfig +++ b/arch/arm/mach-omap2/Kconfig @@ -55,6 +55,7 @@ config SOC_HAS_REALTIME_COUNTER config ARCH_OMAP2 bool "TI OMAP2" depends on ARCH_OMAP2PLUS + depends on ARCH_MULTI_V6 default y select CPU_V6 select MULTI_IRQ_HANDLER @@ -64,6 +65,7 @@ config ARCH_OMAP2 config ARCH_OMAP3 bool "TI OMAP3" depends on ARCH_OMAP2PLUS + depends on ARCH_MULTI_V7 default y select ARCH_HAS_OPP select ARM_CPU_SUSPEND if PM @@ -80,6 +82,7 @@ config ARCH_OMAP4 bool "TI OMAP4" default y depends on ARCH_OMAP2PLUS + depends on ARCH_MULTI_V7 select ARCH_HAS_OPP select ARCH_NEEDS_CPU_IDLE_COUPLED if SMP select ARM_CPU_SUSPEND if PM @@ -99,6 +102,7 @@ config ARCH_OMAP4 config SOC_OMAP5 bool "TI OMAP5" + depends on ARCH_MULTI_V7 select ARM_CPU_SUSPEND if PM select ARM_GIC select CPU_V7 @@ -135,6 +139,7 @@ config SOC_TI81XX config SOC_AM33XX bool "AM33XX support" + depends on ARCH_MULTI_V7 default y select ARM_CPU_SUSPEND if PM select CPU_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. Signed-off-by: Arnd Bergmann <arnd@arndb.de> Cc: Ezequiel Garcia <ezequiel.garcia@free-electrons.com> Cc: Tony Lindgren <tony@atomide.com> --- arch/arm/mach-omap2/Kconfig | 5 +++++ 1 file changed, 5 insertions(+)