From c005bcb1381dfa13c2bb2c7ae2b2cfeef1b8409d Mon Sep 17 00:00:00 2001
From: Bahadir Balban <bahadir.balban@arm.com>
Date: Fri, 18 Apr 2008 22:43:14 +0100
Subject: [PATCH] --- yaml --- r: 91123 b: refs/heads/master c:
 78fdcb4287b5781d8175115430ca50e30899bf09 h: refs/heads/master i:   91121:
 8cc7971b397fdc6dbd21a288f50e85603d3fcbd1   91119:
 810bd26129925d5eee0c805f9f669df05b6389a8 v: v3

---
 [refs]                                | 2 +-
 trunk/arch/arm/Kconfig                | 4 ++--
 trunk/arch/arm/mach-realview/Kconfig  | 9 +++++++++
 trunk/arch/arm/mach-realview/Makefile | 1 +
 trunk/arch/arm/mm/Kconfig             | 2 +-
 5 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index 46e01aa67b91..3e0e4676b47e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 34401ec4668c01156c6c4540930a63840f567a61
+refs/heads/master: 78fdcb4287b5781d8175115430ca50e30899bf09
diff --git a/trunk/arch/arm/Kconfig b/trunk/arch/arm/Kconfig
index 4039a133006e..bbae45a1e13b 100644
--- a/trunk/arch/arm/Kconfig
+++ b/trunk/arch/arm/Kconfig
@@ -650,7 +650,7 @@ source "kernel/time/Kconfig"
 
 config SMP
 	bool "Symmetric Multi-Processing (EXPERIMENTAL)"
-	depends on EXPERIMENTAL && REALVIEW_EB_ARM11MP
+	depends on EXPERIMENTAL && (REALVIEW_EB_ARM11MP || MACH_REALVIEW_PB11MP)
 	help
 	  This enables support for systems with more than one CPU. If you have
 	  a system with only one CPU, like most personal computers, say N. If
@@ -683,7 +683,7 @@ config HOTPLUG_CPU
 
 config LOCAL_TIMERS
 	bool "Use local timer interrupts"
-	depends on SMP && REALVIEW_EB_ARM11MP
+	depends on SMP && (REALVIEW_EB_ARM11MP || MACH_REALVIEW_PB11MP)
 	default y
 	help
 	  Enable support for local timers on SMP platforms, rather then the
diff --git a/trunk/arch/arm/mach-realview/Kconfig b/trunk/arch/arm/mach-realview/Kconfig
index 39b3bb7f1020..24522ac196e7 100644
--- a/trunk/arch/arm/mach-realview/Kconfig
+++ b/trunk/arch/arm/mach-realview/Kconfig
@@ -24,4 +24,13 @@ config REALVIEW_EB_ARM11MP_REVB
 	  kernel built with this option enabled is not compatible with
 	  other revisions of the ARM11MPCore tile.
 
+config MACH_REALVIEW_PB11MP
+	bool "Support RealView/PB11MPCore platform"
+	select ARM_GIC
+	select CACHE_L2X0
+	help
+	  Include support for the ARM(R) RealView MPCore Platform Baseboard.
+	  PB11MPCore is a platform with an on-board ARM11MPCore and has
+	  support for PCI-E and Compact Flash.
+
 endmenu
diff --git a/trunk/arch/arm/mach-realview/Makefile b/trunk/arch/arm/mach-realview/Makefile
index ca1e390c3c28..a1fc2068032a 100644
--- a/trunk/arch/arm/mach-realview/Makefile
+++ b/trunk/arch/arm/mach-realview/Makefile
@@ -4,5 +4,6 @@
 
 obj-y					:= core.o clock.o
 obj-$(CONFIG_MACH_REALVIEW_EB)		+= realview_eb.o
+obj-$(CONFIG_MACH_REALVIEW_PB11MP)	+= realview_pb11mp.o
 obj-$(CONFIG_SMP)			+= platsmp.o headsmp.o localtimer.o
 obj-$(CONFIG_HOTPLUG_CPU)		+= hotplug.o
diff --git a/trunk/arch/arm/mm/Kconfig b/trunk/arch/arm/mm/Kconfig
index b1aa9962816d..bf6d137c4cea 100644
--- a/trunk/arch/arm/mm/Kconfig
+++ b/trunk/arch/arm/mm/Kconfig
@@ -381,7 +381,7 @@ config CPU_FEROCEON_OLD_ID
 # ARMv6
 config CPU_V6
 	bool "Support ARM V6 processor"
-	depends on ARCH_INTEGRATOR || MACH_REALVIEW_EB || ARCH_OMAP2 || ARCH_MX3 || ARCH_MSM7X00A
+	depends on ARCH_INTEGRATOR || MACH_REALVIEW_EB || ARCH_OMAP2 || ARCH_MX3 || ARCH_MSM7X00A || MACH_REALVIEW_PB11MP
 	default y if ARCH_MX3
 	default y if ARCH_MSM7X00A
 	select CPU_32v6