Commit 42f4754a authored by Rob Herring's avatar Rob Herring
Browse files

ARM: Select V6K instead of V6 by default for multi-platform 



MULTI_V6 should default to V6K as it is more optimal than V6. Any
platform which is not V6K should select CPU_V6 which will enable the
less optimal code paths.

Signed-off-by: default avatarRob Herring <robh@kernel.org>
Cc: Anton Vorontsov <anton@enomsg.org>
Acked-by: default avatarShawn Guo <shawn.guo@linaro.org>
Cc: Sascha Hauer <kernel@pengutronix.de>
Cc: Jamie Iles <jamie@jamieiles.com>
Acked-by: default avatarArnd Bergmann <arnd@arndb.de>
parent 9352b05b

arch/arm/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -910,7 +910,7 @@ config ARCH_MULTI_V4_V5 
config ARCH_MULTI_V6

	bool "ARMv6 based platforms (ARM11)"

	select ARCH_MULTI_V6_V7

	select CPU_V6

	select CPU_V6K



config ARCH_MULTI_V7

	bool "ARMv7 based platforms (Cortex-A, PJ4, Scorpion, Krait)"

arch/arm/mach-cns3xxx/Kconfig

+1 −1
Original line number Diff line number Diff line 
config ARCH_CNS3XXX

	bool "Cavium Networks CNS3XXX family" if ARCH_MULTI_V6

	select ARM_GIC

	select CPU_V6K

	select MIGHT_HAVE_PCI

	select PCI_DOMAINS if PCI

	select CPU_V6

	help

	  Support for Cavium Networks CNS3XXX platform.

arch/arm/mach-imx/Kconfig

+0 −1
Original line number Diff line number Diff line
@@ -114,7 +114,6 @@ config SOC_IMX31 
config SOC_IMX35

	bool

	select ARCH_MXC_IOMUX_V3

	select CPU_V6K

	select HAVE_EPIT

	select MXC_AVIC

	select SMP_ON_UP if SMP

arch/arm/mach-picoxcell/Kconfig

+0 −1
Original line number Diff line number Diff line
@@ -2,7 +2,6 @@ config ARCH_PICOXCELL 
	bool "Picochip PicoXcell" if ARCH_MULTI_V6

	select ARCH_REQUIRE_GPIOLIB

	select ARM_VIC

	select CPU_V6K

	select DW_APB_TIMER_OF

	select HAVE_TCM

	select NO_IOPORT

CRA Git | Maintained and supported by SUSTech CRA and CCSE