diff options
| author | Rob Herring <robh@kernel.org> | 2014-01-31 15:26:04 -0500 |
|---|---|---|
| committer | Rob Herring <robh@kernel.org> | 2014-02-19 17:46:32 -0500 |
| commit | 42f4754a0c5fa0d1caeca77e29ad4e09b0762e72 (patch) | |
| tree | e5aba2de1c3aca3d8664f71e037ea965f0c8f833 | |
| parent | 9352b05b6e4ef1aae53744cbd0adc0491fae5be0 (diff) | |
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: Rob Herring <robh@kernel.org>
Cc: Anton Vorontsov <anton@enomsg.org>
Acked-by: Shawn Guo <shawn.guo@linaro.org>
Cc: Sascha Hauer <kernel@pengutronix.de>
Cc: Jamie Iles <jamie@jamieiles.com>
Acked-by: Arnd Bergmann <arnd@arndb.de>
| -rw-r--r-- | arch/arm/Kconfig | 2 | ||||
| -rw-r--r-- | arch/arm/mach-cns3xxx/Kconfig | 2 | ||||
| -rw-r--r-- | arch/arm/mach-imx/Kconfig | 1 | ||||
| -rw-r--r-- | arch/arm/mach-picoxcell/Kconfig | 1 |
4 files changed, 2 insertions, 4 deletions
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index 7560be4cce92..f350ca5d051b 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig | |||
| @@ -910,7 +910,7 @@ config ARCH_MULTI_V4_V5 | |||
| 910 | config ARCH_MULTI_V6 | 910 | config ARCH_MULTI_V6 |
| 911 | bool "ARMv6 based platforms (ARM11)" | 911 | bool "ARMv6 based platforms (ARM11)" |
| 912 | select ARCH_MULTI_V6_V7 | 912 | select ARCH_MULTI_V6_V7 |
| 913 | select CPU_V6 | 913 | select CPU_V6K |
| 914 | 914 | ||
| 915 | config ARCH_MULTI_V7 | 915 | config ARCH_MULTI_V7 |
| 916 | bool "ARMv7 based platforms (Cortex-A, PJ4, Scorpion, Krait)" | 916 | bool "ARMv7 based platforms (Cortex-A, PJ4, Scorpion, Krait)" |
diff --git a/arch/arm/mach-cns3xxx/Kconfig b/arch/arm/mach-cns3xxx/Kconfig index c6f58a15c95e..b16b29a46f9b 100644 --- a/arch/arm/mach-cns3xxx/Kconfig +++ b/arch/arm/mach-cns3xxx/Kconfig | |||
| @@ -1,9 +1,9 @@ | |||
| 1 | config ARCH_CNS3XXX | 1 | config ARCH_CNS3XXX |
| 2 | bool "Cavium Networks CNS3XXX family" if ARCH_MULTI_V6 | 2 | bool "Cavium Networks CNS3XXX family" if ARCH_MULTI_V6 |
| 3 | select ARM_GIC | 3 | select ARM_GIC |
| 4 | select CPU_V6K | ||
| 5 | select MIGHT_HAVE_PCI | 4 | select MIGHT_HAVE_PCI |
| 6 | select PCI_DOMAINS if PCI | 5 | select PCI_DOMAINS if PCI |
| 6 | select CPU_V6 | ||
| 7 | help | 7 | help |
| 8 | Support for Cavium Networks CNS3XXX platform. | 8 | Support for Cavium Networks CNS3XXX platform. |
| 9 | 9 | ||
diff --git a/arch/arm/mach-imx/Kconfig b/arch/arm/mach-imx/Kconfig index ff2447389f27..41ffd433f709 100644 --- a/arch/arm/mach-imx/Kconfig +++ b/arch/arm/mach-imx/Kconfig | |||
| @@ -114,7 +114,6 @@ config SOC_IMX31 | |||
| 114 | config SOC_IMX35 | 114 | config SOC_IMX35 |
| 115 | bool | 115 | bool |
| 116 | select ARCH_MXC_IOMUX_V3 | 116 | select ARCH_MXC_IOMUX_V3 |
| 117 | select CPU_V6K | ||
| 118 | select HAVE_EPIT | 117 | select HAVE_EPIT |
| 119 | select MXC_AVIC | 118 | select MXC_AVIC |
| 120 | select SMP_ON_UP if SMP | 119 | select SMP_ON_UP if SMP |
diff --git a/arch/arm/mach-picoxcell/Kconfig b/arch/arm/mach-picoxcell/Kconfig index c88ff74d86fe..eca9eb1c5931 100644 --- a/arch/arm/mach-picoxcell/Kconfig +++ b/arch/arm/mach-picoxcell/Kconfig | |||
| @@ -2,7 +2,6 @@ config ARCH_PICOXCELL | |||
| 2 | bool "Picochip PicoXcell" if ARCH_MULTI_V6 | 2 | bool "Picochip PicoXcell" if ARCH_MULTI_V6 |
| 3 | select ARCH_REQUIRE_GPIOLIB | 3 | select ARCH_REQUIRE_GPIOLIB |
| 4 | select ARM_VIC | 4 | select ARM_VIC |
| 5 | select CPU_V6K | ||
| 6 | select DW_APB_TIMER_OF | 5 | select DW_APB_TIMER_OF |
| 7 | select HAVE_TCM | 6 | select HAVE_TCM |
| 8 | select NO_IOPORT | 7 | select NO_IOPORT |