X-Git-Url: https://git.karo-electronics.de/?a=blobdiff_plain;f=cpu%2Farm920t%2Fstart.S;h=acc00ad9706309be4e0bdb4d564e61903fb688bd;hb=a6f0bd9f2b1971e2a61ac0fd1fc2c96cb7a4b67a;hp=df2ee20cbe92870c17b229516f49e0c7584754a8;hpb=afd477b227c089f2b7ce0aadb20b9ea7dc6ee6f8;p=karo-tx-uboot.git

diff --git a/cpu/arm920t/start.S b/cpu/arm920t/start.S
index df2ee20cbe..acc00ad970 100644
--- a/cpu/arm920t/start.S
+++ b/cpu/arm920t/start.S
@@ -27,7 +27,7 @@
 
 #include <config.h>
 #include <version.h>
-#include <asm/coloured_led.h>
+#include <status_led.h>
 
 /*
  *************************************************************************
@@ -178,7 +178,7 @@ copyex:
 	bl	cpu_init_crit
 #endif
 
-#ifdef	CONFIG_AT91RM9200
+#ifndef	CONFIG_AT91RM9200
 
 #ifndef CONFIG_SKIP_RELOCATE_UBOOT
 relocate:				/* relocate U-Boot to RAM	    */
@@ -329,12 +329,12 @@ cpu_init_crit:
 	.macro	irq_save_user_regs
 	sub	sp, sp, #S_FRAME_SIZE
 	stmia	sp, {r0 - r12}			@ Calling r0-r12
-	add     r8, sp, #S_PC
-	stmdb   r8, {sp, lr}^                   @ Calling SP, LR
-	str     lr, [r8, #0]                    @ Save calling PC
+	add     r7, sp, #S_PC
+	stmdb   r7, {sp, lr}^                   @ Calling SP, LR
+	str     lr, [r7, #0]                    @ Save calling PC
 	mrs     r6, spsr
-	str     r6, [r8, #4]                    @ Save CPSR
-	str     r0, [r8, #8]                    @ Save OLD_R0
+	str     r6, [r7, #4]                    @ Save CPSR
+	str     r0, [r7, #8]                    @ Save OLD_R0
 	mov	r0, sp
 	.endm