Skip to content

Commit

Permalink
ARM: v6k: do not disable CPU_32v6K based on platform selection
Browse files Browse the repository at this point in the history
CPU_32v6K controls whether we use the ARMv6K extension instructions in
the kernel, and in some places whether we use SMP-safe code sequences
(eg, bitops.)

MX3 prevents the selection of this option to ensure that it is not
enabled for their CPU, which is ARMv6 only.  Now that we've split the
CPU_V6 option, V6K support won't be offered for MX3 anymore.

OMAP prevents the selection of this option in an attempt to produce a
kernel which runs on architectures from ARMv6 to ARMv7 MPCore.  We now
achieve this in a different way (see the previous patches).

As such, we no longer need to offer this as a configuration option to
the user.

Tested-by: Tony Lindgren <tony@atomide.com>
Tested-by: Sourav Poddar <sourav.poddar@ti.com>
Tested-by: Will Deacon <will.deacon@arm.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
  • Loading branch information
Russell King committed Feb 2, 2011
1 parent 8762df4 commit 60799c6
Showing 1 changed file with 3 additions and 11 deletions.
14 changes: 3 additions & 11 deletions arch/arm/mm/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -405,7 +405,7 @@ config CPU_V6
config CPU_V6K
bool "Support ARM V6K processor" if ARCH_INTEGRATOR || MACH_REALVIEW_EB || MACH_REALVIEW_PBX
select CPU_32v6
select CPU_32v6K if !ARCH_OMAP2
select CPU_32v6K
select CPU_ABRT_EV6
select CPU_PABRT_V6
select CPU_CACHE_V6
Expand All @@ -418,7 +418,7 @@ config CPU_V6K
# ARMv7
config CPU_V7
bool "Support ARM V7 processor" if ARCH_INTEGRATOR || MACH_REALVIEW_EB || MACH_REALVIEW_PBX
select CPU_32v6K if !ARCH_OMAP2
select CPU_32v6K
select CPU_32v7
select CPU_ABRT_EV7
select CPU_PABRT_V7
Expand Down Expand Up @@ -461,15 +461,7 @@ config CPU_32v6
select CPU_USE_DOMAINS if CPU_V6 && MMU

config CPU_32v6K
bool "Support ARM V6K processor extensions" if !SMP
depends on CPU_V6 || CPU_V6K || CPU_V7
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
on previous processors, and as such a kernel build with this
enabled will not boot on processors with do not support these
instructions.
bool

config CPU_32v7
bool
Expand Down

0 comments on commit 60799c6

Please sign in to comment.