Просмотр исходного кода

RealView: Enable the configuration options for PB11MPCore

This patch adds the PB11MPCore support to the corresponding Kconfig
and Makefile to enable building.

Signed-off-by: Bahadir Balban <bahadir.balban@arm.com>
Signed-off-by: Catalin Marinas <catalin.marinas@arm.com>
Bahadir Balban 17 лет назад
Родитель
Сommit
78fdcb4287
4 измененных файлов с 13 добавлено и 3 удалено
  1. 2 2
      arch/arm/Kconfig
  2. 9 0
      arch/arm/mach-realview/Kconfig
  3. 1 0
      arch/arm/mach-realview/Makefile
  4. 1 1
      arch/arm/mm/Kconfig

+ 2 - 2
arch/arm/Kconfig

@@ -650,7 +650,7 @@ source "kernel/time/Kconfig"
 
 
 config SMP
 config SMP
 	bool "Symmetric Multi-Processing (EXPERIMENTAL)"
 	bool "Symmetric Multi-Processing (EXPERIMENTAL)"
-	depends on EXPERIMENTAL && REALVIEW_EB_ARM11MP
+	depends on EXPERIMENTAL && (REALVIEW_EB_ARM11MP || MACH_REALVIEW_PB11MP)
 	help
 	help
 	  This enables support for systems with more than one CPU. If you have
 	  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
 	  a system with only one CPU, like most personal computers, say N. If
@@ -683,7 +683,7 @@ config HOTPLUG_CPU
 
 
 config LOCAL_TIMERS
 config LOCAL_TIMERS
 	bool "Use local timer interrupts"
 	bool "Use local timer interrupts"
-	depends on SMP && REALVIEW_EB_ARM11MP
+	depends on SMP && (REALVIEW_EB_ARM11MP || MACH_REALVIEW_PB11MP)
 	default y
 	default y
 	help
 	help
 	  Enable support for local timers on SMP platforms, rather then the
 	  Enable support for local timers on SMP platforms, rather then the

+ 9 - 0
arch/arm/mach-realview/Kconfig

@@ -24,4 +24,13 @@ config REALVIEW_EB_ARM11MP_REVB
 	  kernel built with this option enabled is not compatible with
 	  kernel built with this option enabled is not compatible with
 	  other revisions of the ARM11MPCore tile.
 	  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
 endmenu

+ 1 - 0
arch/arm/mach-realview/Makefile

@@ -4,5 +4,6 @@
 
 
 obj-y					:= core.o clock.o
 obj-y					:= core.o clock.o
 obj-$(CONFIG_MACH_REALVIEW_EB)		+= realview_eb.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_SMP)			+= platsmp.o headsmp.o localtimer.o
 obj-$(CONFIG_HOTPLUG_CPU)		+= hotplug.o
 obj-$(CONFIG_HOTPLUG_CPU)		+= hotplug.o

+ 1 - 1
arch/arm/mm/Kconfig

@@ -381,7 +381,7 @@ config CPU_FEROCEON_OLD_ID
 # ARMv6
 # ARMv6
 config CPU_V6
 config CPU_V6
 	bool "Support ARM V6 processor"
 	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_MX3
 	default y if ARCH_MSM7X00A
 	default y if ARCH_MSM7X00A
 	select CPU_32v6
 	select CPU_32v6