diff options
author | Bahadir Balban <bahadir.balban@arm.com> | 2008-04-18 17:43:14 -0400 |
---|---|---|
committer | Catalin Marinas <catalin.marinas@arm.com> | 2008-04-18 17:43:14 -0400 |
commit | 78fdcb4287b5781d8175115430ca50e30899bf09 (patch) | |
tree | eab6331ecaba846941544a3bc31c2815ef43cf89 /arch | |
parent | 34401ec4668c01156c6c4540930a63840f567a61 (diff) |
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>
Diffstat (limited to 'arch')
-rw-r--r-- | arch/arm/Kconfig | 4 | ||||
-rw-r--r-- | arch/arm/mach-realview/Kconfig | 9 | ||||
-rw-r--r-- | arch/arm/mach-realview/Makefile | 1 | ||||
-rw-r--r-- | arch/arm/mm/Kconfig | 2 |
4 files changed, 13 insertions, 3 deletions
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index 4039a133006e..bbae45a1e13b 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig | |||
@@ -650,7 +650,7 @@ source "kernel/time/Kconfig" | |||
650 | 650 | ||
651 | config SMP | 651 | config SMP |
652 | bool "Symmetric Multi-Processing (EXPERIMENTAL)" | 652 | bool "Symmetric Multi-Processing (EXPERIMENTAL)" |
653 | depends on EXPERIMENTAL && REALVIEW_EB_ARM11MP | 653 | depends on EXPERIMENTAL && (REALVIEW_EB_ARM11MP || MACH_REALVIEW_PB11MP) |
654 | help | 654 | help |
655 | This enables support for systems with more than one CPU. If you have | 655 | This enables support for systems with more than one CPU. If you have |
656 | a system with only one CPU, like most personal computers, say N. If | 656 | a system with only one CPU, like most personal computers, say N. If |
@@ -683,7 +683,7 @@ config HOTPLUG_CPU | |||
683 | 683 | ||
684 | config LOCAL_TIMERS | 684 | config LOCAL_TIMERS |
685 | bool "Use local timer interrupts" | 685 | bool "Use local timer interrupts" |
686 | depends on SMP && REALVIEW_EB_ARM11MP | 686 | depends on SMP && (REALVIEW_EB_ARM11MP || MACH_REALVIEW_PB11MP) |
687 | default y | 687 | default y |
688 | help | 688 | help |
689 | Enable support for local timers on SMP platforms, rather then the | 689 | Enable support for local timers on SMP platforms, rather then the |
diff --git a/arch/arm/mach-realview/Kconfig b/arch/arm/mach-realview/Kconfig index 39b3bb7f1020..24522ac196e7 100644 --- a/arch/arm/mach-realview/Kconfig +++ b/arch/arm/mach-realview/Kconfig | |||
@@ -24,4 +24,13 @@ config REALVIEW_EB_ARM11MP_REVB | |||
24 | kernel built with this option enabled is not compatible with | 24 | kernel built with this option enabled is not compatible with |
25 | other revisions of the ARM11MPCore tile. | 25 | other revisions of the ARM11MPCore tile. |
26 | 26 | ||
27 | config MACH_REALVIEW_PB11MP | ||
28 | bool "Support RealView/PB11MPCore platform" | ||
29 | select ARM_GIC | ||
30 | select CACHE_L2X0 | ||
31 | help | ||
32 | Include support for the ARM(R) RealView MPCore Platform Baseboard. | ||
33 | PB11MPCore is a platform with an on-board ARM11MPCore and has | ||
34 | support for PCI-E and Compact Flash. | ||
35 | |||
27 | endmenu | 36 | endmenu |
diff --git a/arch/arm/mach-realview/Makefile b/arch/arm/mach-realview/Makefile index ca1e390c3c28..a1fc2068032a 100644 --- a/arch/arm/mach-realview/Makefile +++ b/arch/arm/mach-realview/Makefile | |||
@@ -4,5 +4,6 @@ | |||
4 | 4 | ||
5 | obj-y := core.o clock.o | 5 | obj-y := core.o clock.o |
6 | obj-$(CONFIG_MACH_REALVIEW_EB) += realview_eb.o | 6 | obj-$(CONFIG_MACH_REALVIEW_EB) += realview_eb.o |
7 | obj-$(CONFIG_MACH_REALVIEW_PB11MP) += realview_pb11mp.o | ||
7 | obj-$(CONFIG_SMP) += platsmp.o headsmp.o localtimer.o | 8 | obj-$(CONFIG_SMP) += platsmp.o headsmp.o localtimer.o |
8 | obj-$(CONFIG_HOTPLUG_CPU) += hotplug.o | 9 | obj-$(CONFIG_HOTPLUG_CPU) += hotplug.o |
diff --git a/arch/arm/mm/Kconfig b/arch/arm/mm/Kconfig index b1aa9962816d..bf6d137c4cea 100644 --- a/arch/arm/mm/Kconfig +++ b/arch/arm/mm/Kconfig | |||
@@ -381,7 +381,7 @@ config CPU_FEROCEON_OLD_ID | |||
381 | # ARMv6 | 381 | # ARMv6 |
382 | config CPU_V6 | 382 | config CPU_V6 |
383 | bool "Support ARM V6 processor" | 383 | bool "Support ARM V6 processor" |
384 | depends on ARCH_INTEGRATOR || MACH_REALVIEW_EB || ARCH_OMAP2 || ARCH_MX3 || ARCH_MSM7X00A | 384 | depends on ARCH_INTEGRATOR || MACH_REALVIEW_EB || ARCH_OMAP2 || ARCH_MX3 || ARCH_MSM7X00A || MACH_REALVIEW_PB11MP |
385 | default y if ARCH_MX3 | 385 | default y if ARCH_MX3 |
386 | default y if ARCH_MSM7X00A | 386 | default y if ARCH_MSM7X00A |
387 | select CPU_32v6 | 387 | select CPU_32v6 |