projects
/
oweals
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of git://www.denx.de/git/u-boot-video
[oweals/u-boot.git]
/
cpu
/
arm920t
/
start.S
diff --git
a/cpu/arm920t/start.S
b/cpu/arm920t/start.S
index aefcdd1552fb051c432b6a643f2c3d02219e980f..acc00ad9706309be4e0bdb4d564e61903fb688bd 100644
(file)
--- a/
cpu/arm920t/start.S
+++ b/
cpu/arm920t/start.S
@@
-178,7
+178,7
@@
copyex:
bl cpu_init_crit
#endif
bl cpu_init_crit
#endif
-#if
def
CONFIG_AT91RM9200
+#if
ndef
CONFIG_AT91RM9200
#ifndef CONFIG_SKIP_RELOCATE_UBOOT
relocate: /* relocate U-Boot to RAM */
#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
.macro irq_save_user_regs
sub sp, sp, #S_FRAME_SIZE
stmia sp, {r0 - r12} @ Calling r0-r12
- add r
8
, sp, #S_PC
- stmdb r
8
, {sp, lr}^ @ Calling SP, LR
- str lr, [r
8
, #0] @ Save calling PC
+ add r
7
, sp, #S_PC
+ stmdb r
7
, {sp, lr}^ @ Calling SP, LR
+ str lr, [r
7
, #0] @ Save calling PC
mrs r6, spsr
mrs r6, spsr
- str r6, [r
8
, #4] @ Save CPSR
- str r0, [r
8
, #8] @ Save OLD_R0
+ str r6, [r
7
, #4] @ Save CPSR
+ str r0, [r
7
, #8] @ Save OLD_R0
mov r0, sp
.endm
mov r0, sp
.endm