summaryrefslogtreecommitdiff
path: root/include/asm-arm/arch-realview
diff options
context:
space:
mode:
authorCatalin Marinas <catalin.marinas@arm.com>2008-02-04 17:47:04 +0100
committerRussell King <rmk+kernel@arm.linux.org.uk>2008-02-04 17:52:28 +0000
commit41579f49da23e2d26b6e5efa5c3311998e911e5c (patch)
treeea7e7d6ca2dedb36712065f45d5d2c12441510da /include/asm-arm/arch-realview
parent39e823e35b791b905e0d8eba62e8b3a0b3351936 (diff)
[ARM] 4822/1: RealView: Change the REALVIEW_MPCORE configuration option
This patch changes the REALVIEW_MPCORE configuration option to REALVIEW_EB_ARM11MP since this is only specific to RealView/EB. Signed-off-by: Catalin Marinas <catalin.marinas@arm.com> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'include/asm-arm/arch-realview')
-rw-r--r--include/asm-arm/arch-realview/board-eb.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/include/asm-arm/arch-realview/board-eb.h b/include/asm-arm/arch-realview/board-eb.h
index 9e76b236b529..3e437b7f425a 100644
--- a/include/asm-arm/arch-realview/board-eb.h
+++ b/include/asm-arm/arch-realview/board-eb.h
@@ -26,7 +26,7 @@
/*
* RealView EB + ARM11MPCore peripheral addresses
*/
-#ifdef CONFIG_REALVIEW_MPCORE_REVB
+#ifdef CONFIG_REALVIEW_EB_ARM11MP_REVB
#define REALVIEW_EB11MP_SCU_BASE 0x10100000 /* SCU registers */
#define REALVIEW_EB11MP_GIC_CPU_BASE 0x10100100 /* Generic interrupt controller CPU interface */
#define REALVIEW_EB11MP_TWD_BASE 0x10100700
@@ -143,7 +143,7 @@
#define NR_IRQS NR_IRQS_EB
#endif
-#if defined(CONFIG_REALVIEW_MPCORE) \
+#if defined(CONFIG_REALVIEW_EB_ARM11MP) \
&& (!defined(MAX_GIC_NR) || (MAX_GIC_NR < NR_GIC_EB11MP))
#undef MAX_GIC_NR
#define MAX_GIC_NR NR_GIC_EB11MP
@@ -162,7 +162,7 @@
((readl(__io_address(REALVIEW_SYS_PROCID)) & REALVIEW_EB_PROC_MASK) \
== proc_type)
-#ifdef CONFIG_REALVIEW_MPCORE
+#ifdef CONFIG_REALVIEW_EB_ARM11MP
#define core_tile_eb11mp() check_eb_proc(REALVIEW_EB_PROC_ARM11MP)
#else
#define core_tile_eb11mp() 0