summaryrefslogtreecommitdiff
path: root/cpu/arm925t
diff options
context:
space:
mode:
authorKumar Gala <galak@kernel.crashing.org>2006-04-20 17:25:10 (GMT)
committerKumar Gala <galak@kernel.crashing.org>2006-04-20 17:25:10 (GMT)
commitb86d7622b33892b1dafe761a7a9eaeeab9f3816b (patch)
tree56b1b6fc978166abce4afa8e9dee0af94bfc3cd6 /cpu/arm925t
parentf8edca2e9a128f526b1fe6f997f7adb852cf5b3c (diff)
parent56a4a63c106cc317fc0fe42686a99416fc469f5b (diff)
downloadu-boot-b86d7622b33892b1dafe761a7a9eaeeab9f3816b.tar.xz
Merge branch 'master' of rsync://rsync.denx.de/git/u-boot
Diffstat (limited to 'cpu/arm925t')
-rw-r--r--cpu/arm925t/cpu.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/cpu/arm925t/cpu.c b/cpu/arm925t/cpu.c
index c1c6b03..d85b7fa 100644
--- a/cpu/arm925t/cpu.c
+++ b/cpu/arm925t/cpu.c
@@ -33,6 +33,10 @@
#include <command.h>
#include <arm925t.h>
+#ifdef CONFIG_USE_IRQ
+DECLARE_GLOBAL_DATA_PTR;
+#endif
+
/* read co-processor 15, register #1 (control register) */
static unsigned long read_p15_c1 (void)
{
@@ -91,8 +95,6 @@ int cpu_init (void)
* setup up stacks if necessary
*/
#ifdef CONFIG_USE_IRQ
- DECLARE_GLOBAL_DATA_PTR;
-
IRQ_STACK_START = _armboot_start - CFG_MALLOC_LEN - CFG_GBL_DATA_SIZE - 4;
FIQ_STACK_START = IRQ_STACK_START - CONFIG_STACKSIZE_IRQ;
#endif