Commit 1a28e3d9 authored by Tony Lindgren's avatar Tony Lindgren Committed by Russell King
Browse files

ARM: 5911/1: ARM: Select CPU_32v6K for CPU_V7 only if ARCH_OMAP2 is not selected 



Otherwise the kernel built with both CPU_V6 and CPU_V7 will not
boot on omap2.

Signed-off-by: default avatarTony Lindgren <tony@atomide.com>
Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent 11805bcf

arch/arm/mm/Kconfig

+2 −2
Original line number Diff line number Diff line
@@ -399,7 +399,7 @@ config CPU_V6 
config CPU_32v6K

	bool "Support ARM V6K processor extensions" if !SMP

	depends on CPU_V6

	default y if SMP && !ARCH_MX3

	default y if SMP && !(ARCH_MX3 || ARCH_OMAP2)

	help

	  Say Y here if your ARMv6 processor supports the 'K' extension.

	  This enables the kernel to use some instructions not present
@@ -410,7 +410,7 @@ config CPU_32v6K 
# ARMv7

config CPU_V7

	bool "Support ARM V7 processor" if ARCH_INTEGRATOR || MACH_REALVIEW_EB || MACH_REALVIEW_PBX

	select CPU_32v6K

	select CPU_32v6K if !ARCH_OMAP2

	select CPU_32v7

	select CPU_ABRT_EV7

	select CPU_PABRT_V7