summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorArnd Bergmann <arnd@arndb.de>2014-03-25 22:19:00 +0100
committerArnd Bergmann <arnd@arndb.de>2014-03-27 02:35:44 +0100
commitf8afae40a076347eeb9be179522b570e50d39af4 (patch)
tree9d7466751498726f533ac12edd5cc762d0c9b3dd
parentbf5fd5bf0a96a8bbc9c073118fc646bae13e24bd (diff)
downloadop-kernel-dev-f8afae40a076347eeb9be179522b570e50d39af4.zip
op-kernel-dev-f8afae40a076347eeb9be179522b570e50d39af4.tar.gz
ARM: moxart: fix CPU selection
Moxart uses an FA526 CPU core, which is ARMv4 based, not ARMv4T. Before moxart, we had no CONFIG_MULTI_V4 option, since no ARMv4 platform was enabled for multiplatform. This now adds the missing option, which will give us slightly more efficient code on pure moxart kernels, because we can build a pure FA526 kernel now rather than a combined FA526+ARM920T kernel that we used to. Signed-off-by: Arnd Bergmann <arnd@arndb.de>
-rw-r--r--arch/arm/Kconfig6
-rw-r--r--arch/arm/mach-moxart/Kconfig2
2 files changed, 7 insertions, 1 deletions
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index 3dad961..4f85b09 100644
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -893,6 +893,12 @@ menu "Multiple platform selection"
comment "CPU Core family selection"
+config ARCH_MULTI_V4
+ bool "ARMv4 based platforms (FA526)"
+ depends on !ARCH_MULTI_V6_V7
+ select ARCH_MULTI_V4_V5
+ select CPU_FA526
+
config ARCH_MULTI_V4T
bool "ARMv4T based platforms (ARM720T, ARM920T, ...)"
depends on !ARCH_MULTI_V6_V7
diff --git a/arch/arm/mach-moxart/Kconfig b/arch/arm/mach-moxart/Kconfig
index 3795ae2..e9b45bb 100644
--- a/arch/arm/mach-moxart/Kconfig
+++ b/arch/arm/mach-moxart/Kconfig
@@ -1,5 +1,5 @@
config ARCH_MOXART
- bool "MOXA ART SoC" if ARCH_MULTI_V4T
+ bool "MOXA ART SoC" if ARCH_MULTI_V4
select CPU_FA526
select ARM_DMA_MEM_BUFFERABLE
select USE_OF
OpenPOWER on IntegriCloud