summaryrefslogtreecommitdiffstats
path: root/cpu/arm926ejs/start.S
diff options
context:
space:
mode:
Diffstat (limited to 'cpu/arm926ejs/start.S')
-rw-r--r--cpu/arm926ejs/start.S11
1 files changed, 9 insertions, 2 deletions
diff --git a/cpu/arm926ejs/start.S b/cpu/arm926ejs/start.S
index d62940b..fc6b20b 100644
--- a/cpu/arm926ejs/start.S
+++ b/cpu/arm926ejs/start.S
@@ -222,7 +222,7 @@ cpu_init_crit:
* Go setup Memory and board specific bits prior to relocation.
*/
mov ip, lr /* perserve link reg across call */
- bl platformsetup /* go setup pll,mux,memory */
+ bl lowlevel_init /* go setup pll,mux,memory */
mov lr, ip /* restore link */
mov pc, lr /* back to my caller */
/*
@@ -393,6 +393,12 @@ fiq:
#endif
+# ifdef CONFIG_INTEGRATOR
+
+ /* Satisfied by Integrator routine (AP or CP) */
+
+#else
+
.align 5
.globl reset_cpu
reset_cpu:
@@ -404,6 +410,7 @@ reset_cpu:
_loop_forever:
b _loop_forever
-
rstctl1:
.word 0xfffece10
+
+#endif /* #ifdef CONFIG_INTEGRATOR */