summaryrefslogtreecommitdiffstats
path: root/arch/arm/configs
diff options
context:
space:
mode:
authorJason Cooper <jason@lakedaemon.net>2012-11-21 20:01:15 +0000
committerJason Cooper <jason@lakedaemon.net>2012-11-21 20:01:15 +0000
commit86b7d3f7797908914735da83eb30df9d81fbd50a (patch)
tree267be5e3d77265ee3feaa4507401eaea0b65f1ff /arch/arm/configs
parent9580e3e3fb44a5b7a1bfefccf4f03481cdbd3c5a (diff)
parent45f5984a8a528f7507f3ec860d297934d4449ad1 (diff)
downloadop-kernel-dev-86b7d3f7797908914735da83eb30df9d81fbd50a.zip
op-kernel-dev-86b7d3f7797908914735da83eb30df9d81fbd50a.tar.gz
Merge tag 'marvell-armadaxp-smp-for-3.8' of git://github.com/MISL-EBU-System-SW/mainline-public into mvebu/everything
SMP support for Armada XP The purpose of this series is to add the SMP support for the Armada XP SoCs. Beside the SMP support itself brought by the last 3 commits, this series also adds the support for the coherency fabric unit and the power management service unit. The coherency fabric is responsible for ensuring hardware coherency between all CPUs and between CPUs and I/O masters. This unit is also available for Armada 370 and will be used in an incoming patch set for hardware I/O cache coherency. The power management service unit is responsible for powering down and waking up CPUs and other SOC units.
Diffstat (limited to 'arch/arm/configs')
-rw-r--r--arch/arm/configs/mvebu_defconfig3
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/arm/configs/mvebu_defconfig b/arch/arm/configs/mvebu_defconfig
index cc2c3b2..6008f12 100644
--- a/arch/arm/configs/mvebu_defconfig
+++ b/arch/arm/configs/mvebu_defconfig
@@ -12,6 +12,9 @@ CONFIG_ARCH_MVEBU=y
CONFIG_MACH_ARMADA_370=y
CONFIG_MACH_ARMADA_XP=y
# CONFIG_CACHE_L2X0 is not set
+# CONFIG_SWP_EMULATE is not set
+CONFIG_SMP=y
+# CONFIG_LOCAL_TIMERS is not set
CONFIG_AEABI=y
CONFIG_HIGHMEM=y
# CONFIG_COMPACTION is not set
OpenPOWER on IntegriCloud