diff options
| author | Jon Loeliger <jdl@freescale.com> | 2008-02-13 16:03:20 -0600 |
|---|---|---|
| committer | Jon Loeliger <jdl@freescale.com> | 2008-02-13 16:03:20 -0600 |
| commit | d075eec500acffed5fa404a45a3e12e158d0cb33 (patch) | |
| tree | 2cecaae4e1c324827caa65d6c5215642ed4a91ed /cpu/arm920t/start.S | |
| parent | 60c1b95aabbfac17b0ea9422828784e163348c5c (diff) | |
| parent | 10bbb38a402a2faf18858c451bcdc63d45888e6e (diff) | |
| download | u-boot-imx-d075eec500acffed5fa404a45a3e12e158d0cb33.zip u-boot-imx-d075eec500acffed5fa404a45a3e12e158d0cb33.tar.gz u-boot-imx-d075eec500acffed5fa404a45a3e12e158d0cb33.tar.bz2 | |
Merge commit 'wd/master'
Diffstat (limited to 'cpu/arm920t/start.S')
| -rw-r--r-- | cpu/arm920t/start.S | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/cpu/arm920t/start.S b/cpu/arm920t/start.S index aefcdd1..ae86002 100644 --- a/cpu/arm920t/start.S +++ b/cpu/arm920t/start.S @@ -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 |