aboutsummaryrefslogtreecommitdiff
path: root/include/asm-arm/arch-realview/entry-macro.S
diff options
context:
space:
mode:
authorCatalin Marinas <catalin.marinas@arm.com>2008-02-04 17:34:58 +0100
committerRussell King <rmk+kernel@arm.linux.org.uk>2008-02-04 17:52:21 +0000
commit356cb470b84bda67738ba320a75629acae70e5fa (patch)
treec426d96dda62632d8b2b7ff69c22bc8f90bf4986 /include/asm-arm/arch-realview/entry-macro.S
parent93c2904d5081468128e66792a85439df314de773 (diff)
[ARM] 4816/1: RealView: Move the platform-specific definitions into board-eb.h
This patch moves the platform specific definitions from platform.h into the board-eb.h file. It drops the INT_* definitions as they are no longer used in irqs.h (moved to board-eb.h). It renames REALVIEW_* macros to REALVIEW_EB_* or REALVIEW_EB11MP_* to distinguish between standard EB and EB + the ARM11MPCore tile. The platform.h file contains common definitions to the RealView platforms and it is only directly included in board-*.h files. 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/entry-macro.S')
-rw-r--r--include/asm-arm/arch-realview/entry-macro.S5
1 files changed, 5 insertions, 0 deletions
diff --git a/include/asm-arm/arch-realview/entry-macro.S b/include/asm-arm/arch-realview/entry-macro.S
index 3b4e2076603..629944deed5 100644
--- a/include/asm-arm/arch-realview/entry-macro.S
+++ b/include/asm-arm/arch-realview/entry-macro.S
@@ -9,12 +9,17 @@
*/
#include <asm/hardware.h>
#include <asm/hardware/gic.h>
+#include <asm/arch/board-eb.h>
.macro disable_fiq
.endm
.macro get_irqnr_preamble, base, tmp
+#ifdef CONFIG_REALVIEW_MPCORE
+ ldr \base, =IO_ADDRESS(REALVIEW_EB11MP_GIC_CPU_BASE)
+#else
ldr \base, =IO_ADDRESS(REALVIEW_GIC_CPU_BASE)
+#endif
.endm
.macro arch_ret_to_user, tmp1, tmp2