mirror of
https://github.com/torvalds/linux.git
synced 2024-10-24 14:10:59 +00:00
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>
This commit is contained in:
parent
11805bcfa4
commit
1a28e3d977
|
@ -399,7 +399,7 @@ config CPU_V6
|
||||||
config CPU_32v6K
|
config CPU_32v6K
|
||||||
bool "Support ARM V6K processor extensions" if !SMP
|
bool "Support ARM V6K processor extensions" if !SMP
|
||||||
depends on CPU_V6
|
depends on CPU_V6
|
||||||
default y if SMP && !ARCH_MX3
|
default y if SMP && !(ARCH_MX3 || ARCH_OMAP2)
|
||||||
help
|
help
|
||||||
Say Y here if your ARMv6 processor supports the 'K' extension.
|
Say Y here if your ARMv6 processor supports the 'K' extension.
|
||||||
This enables the kernel to use some instructions not present
|
This enables the kernel to use some instructions not present
|
||||||
|
@ -410,7 +410,7 @@ config CPU_32v6K
|
||||||
# ARMv7
|
# ARMv7
|
||||||
config CPU_V7
|
config CPU_V7
|
||||||
bool "Support ARM V7 processor" if ARCH_INTEGRATOR || MACH_REALVIEW_EB || MACH_REALVIEW_PBX
|
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_32v7
|
||||||
select CPU_ABRT_EV7
|
select CPU_ABRT_EV7
|
||||||
select CPU_PABRT_V7
|
select CPU_PABRT_V7
|
||||||
|
|
Loading…
Reference in New Issue
Block a user