diff options
author | Tony Lindgren <tony@atomide.com> | 2010-02-01 17:30:26 -0500 |
---|---|---|
committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-02-15 16:39:51 -0500 |
commit | 1a28e3d977860dc760909083df625b300f695680 (patch) | |
tree | 5d8cb0da5f5c22a32ad5fb8e38ca4b4f21300d79 /arch/arm/mm/Kconfig | |
parent | 11805bcfa411c816b7c76fc40724be6733c74ffc (diff) |
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: Tony Lindgren <tony@atomide.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'arch/arm/mm/Kconfig')
-rw-r--r-- | arch/arm/mm/Kconfig | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mm/Kconfig b/arch/arm/mm/Kconfig index baf638487a2d..4c2e90dc549c 100644 --- a/arch/arm/mm/Kconfig +++ b/arch/arm/mm/Kconfig | |||
@@ -399,7 +399,7 @@ config CPU_V6 | |||
399 | config CPU_32v6K | 399 | config CPU_32v6K |
400 | bool "Support ARM V6K processor extensions" if !SMP | 400 | bool "Support ARM V6K processor extensions" if !SMP |
401 | depends on CPU_V6 | 401 | depends on CPU_V6 |
402 | default y if SMP && !ARCH_MX3 | 402 | default y if SMP && !(ARCH_MX3 || ARCH_OMAP2) |
403 | help | 403 | help |
404 | Say Y here if your ARMv6 processor supports the 'K' extension. | 404 | Say Y here if your ARMv6 processor supports the 'K' extension. |
405 | This enables the kernel to use some instructions not present | 405 | This enables the kernel to use some instructions not present |
@@ -410,7 +410,7 @@ config CPU_32v6K | |||
410 | # ARMv7 | 410 | # ARMv7 |
411 | config CPU_V7 | 411 | config CPU_V7 |
412 | bool "Support ARM V7 processor" if ARCH_INTEGRATOR || MACH_REALVIEW_EB || MACH_REALVIEW_PBX | 412 | bool "Support ARM V7 processor" if ARCH_INTEGRATOR || MACH_REALVIEW_EB || MACH_REALVIEW_PBX |
413 | select CPU_32v6K | 413 | select CPU_32v6K if !ARCH_OMAP2 |
414 | select CPU_32v7 | 414 | select CPU_32v7 |
415 | select CPU_ABRT_EV7 | 415 | select CPU_ABRT_EV7 |
416 | select CPU_PABRT_V7 | 416 | select CPU_PABRT_V7 |