From f07771cc288eb86cad8f8a5c1aa593caf2ba26f8 Mon Sep 17 00:00:00 2001
From: wdenk <wdenk>
Date: Wed, 28 May 2003 08:06:31 +0000
Subject: * Fix data abort exception handling for arm920t CPU

* Fix alignment problems with flash driver for TRAB board

* Patch by Donald White, 21 May 2003:
  fix calculation of base address in pci_hose_config_device()

* Fix bug in command line parsing: "cmd1;cmd2" is supposed to always
  execute "cmd2", even if "cmd1" fails. Note that this is different
  to "run var1 var2" where the contents of "var2" will NOT be
  executed when a command in "var1" fails.
---
 cpu/arm920t/start.S | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

(limited to 'cpu/arm920t')

diff --git a/cpu/arm920t/start.S b/cpu/arm920t/start.S
index 4a4825a..ed16176 100644
--- a/cpu/arm920t/start.S
+++ b/cpu/arm920t/start.S
@@ -317,17 +317,15 @@ cpu_init_crit:
 	.macro	bad_save_user_regs
 	sub	sp, sp, #S_FRAME_SIZE
 	stmia	sp, {r0 - r12}			@ Calling r0-r12
-	add     r8, sp, #S_PC
-
 	ldr	r2, _armboot_end
 	add	r2, r2, #CONFIG_STACKSIZE
 	sub	r2, r2, #8
-	ldmia	r2, {r2 - r4}                   @ get pc, cpsr, old_r0
+	ldmia	r2, {r2 - r3}			@ get pc, cpsr
 	add	r0, sp, #S_FRAME_SIZE		@ restore sp_SVC
 
 	add	r5, sp, #S_SP
 	mov	r1, lr
-	stmia	r5, {r0 - r4}                   @ save sp_SVC, lr_SVC, pc, cpsr, old_r
+	stmia	r5, {r0 - r3}			@ save sp_SVC, lr_SVC, pc, cpsr
 	mov	r0, sp
 	.endm
 
-- 
cgit v1.1