From: robherring2@gmail.com (Rob Herring)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH 4/9] ARM: Select V6K instead of V6 by default for multi-platform
Date: Tue, 11 Feb 2014 15:11:54 -0600 [thread overview]
Message-ID: <1392153119-23248-5-git-send-email-robherring2@gmail.com> (raw)
In-Reply-To: <1392153119-23248-1-git-send-email-robherring2@gmail.com>
From: Rob Herring <robh@kernel.org>
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>
Cc: Shawn Guo <shawn.guo@linaro.org>
Cc: Sascha Hauer <kernel@pengutronix.de>
Cc: Jamie Iles <jamie@jamieiles.com>
---
arch/arm/Kconfig | 2 +-
arch/arm/mach-cns3xxx/Kconfig | 2 +-
arch/arm/mach-imx/Kconfig | 1 -
arch/arm/mach-picoxcell/Kconfig | 1 -
4 files changed, 2 insertions(+), 4 deletions(-)
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index 7560be4..f350ca5 100644
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -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)"
diff --git a/arch/arm/mach-cns3xxx/Kconfig b/arch/arm/mach-cns3xxx/Kconfig
index c6f58a1..b16b29a 100644
--- a/arch/arm/mach-cns3xxx/Kconfig
+++ b/arch/arm/mach-cns3xxx/Kconfig
@@ -1,9 +1,9 @@
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.
diff --git a/arch/arm/mach-imx/Kconfig b/arch/arm/mach-imx/Kconfig
index ff24473..41ffd43 100644
--- a/arch/arm/mach-imx/Kconfig
+++ b/arch/arm/mach-imx/Kconfig
@@ -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
diff --git a/arch/arm/mach-picoxcell/Kconfig b/arch/arm/mach-picoxcell/Kconfig
index c88ff74..eca9eb1 100644
--- a/arch/arm/mach-picoxcell/Kconfig
+++ b/arch/arm/mach-picoxcell/Kconfig
@@ -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
--
1.8.3.2
next prev parent reply other threads:[~2014-02-11 21:11 UTC|newest]
Thread overview: 37+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-02-11 21:11 [PATCH v2 0/9] ARM: multi-platform kconfig cleanup and mach-virt removal Rob Herring
2014-02-11 21:11 ` [PATCH v2 1/9] ARM: centralize common multi-platform kconfig options Rob Herring
2014-02-14 10:40 ` Linus Walleij
2014-02-14 14:02 ` Rob Herring
2014-02-24 9:41 ` Linus Walleij
2014-02-28 18:37 ` Kevin Hilman
2014-02-28 20:15 ` Arnd Bergmann
2014-02-28 20:22 ` Kevin Hilman
2014-02-28 20:33 ` Arnd Bergmann
2014-04-20 10:56 ` Daniel Willmann
2014-02-11 21:11 ` [PATCH 2/9] ARM: select HAVE_SMP for V7 multi-platform Rob Herring
2014-02-14 10:41 ` Linus Walleij
2014-02-11 21:11 ` [PATCH 3/9] ARM: select MIGHT_HAVE_CACHE_L2X0 " Rob Herring
2014-02-12 20:32 ` Stephen Warren
2014-02-13 13:10 ` Rob Herring
2014-02-11 21:11 ` Rob Herring [this message]
2014-02-11 21:22 ` [PATCH 4/9] ARM: Select V6K instead of V6 by default for multi-platform Arnd Bergmann
2014-02-11 21:26 ` Rob Herring
2014-02-11 21:27 ` Arnd Bergmann
2014-02-12 4:07 ` Shawn Guo
2014-02-11 21:11 ` [PATCH 5/9] ARM: bcm2835: enable V6K instead of plain V6 Rob Herring
2014-02-11 21:11 ` [PATCH 6/9] ARM: cns3xxx: " Rob Herring
2014-02-11 21:11 ` [PATCH 7/9] ARM: vt8500: " Rob Herring
2014-02-11 21:11 ` [PATCH 8/9] ARM: virt: make mach-virt just a kconfig option Rob Herring
2014-02-12 14:03 ` Marc Zyngier
2014-02-11 21:11 ` [PATCH 9/9] ARM: virt: select ARM_AMBA Rob Herring
2014-02-12 13:26 ` [PATCH v2 0/9] ARM: multi-platform kconfig cleanup and mach-virt removal Arnd Bergmann
2014-02-12 13:46 ` Will Deacon
2014-02-12 14:07 ` Rob Herring
2014-02-12 16:53 ` Arnd Bergmann
2014-02-12 17:11 ` Marc Zyngier
2014-02-12 17:16 ` Will Deacon
2014-02-12 18:07 ` Arnd Bergmann
2014-02-12 18:15 ` Will Deacon
2014-02-12 18:20 ` Arnd Bergmann
2014-02-12 20:38 ` Stephen Warren
2014-02-13 2:30 ` Stephen Warren
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1392153119-23248-5-git-send-email-robherring2@gmail.com \
--to=robherring2@gmail.com \
--cc=linux-arm-kernel@lists.infradead.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.