summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWolfgang Denk <wd@pollux.denx.de>2005-08-04 01:24:19 +0200
committerWolfgang Denk <wd@pollux.denx.de>2005-08-04 01:24:19 +0200
commit3e0bc4473add883fd68a49b7dab971191b943415 (patch)
treebc2a973acf23534f1bb467b4c82c434af8242be5
parent460c322f13ec0e20d3ac72fe375873458999e43a (diff)
downloadu-boot-imx-3e0bc4473add883fd68a49b7dab971191b943415.zip
u-boot-imx-3e0bc4473add883fd68a49b7dab971191b943415.tar.gz
u-boot-imx-3e0bc4473add883fd68a49b7dab971191b943415.tar.bz2
Fix typos in cpu/85xx/start.S which caused DataTLB exception to be
routed to the Watchdog handler Patch by Eugene Surovegin, 18 Jun 2005
-rw-r--r--CHANGELOG4
-rw-r--r--cpu/mpc85xx/start.S4
2 files changed, 6 insertions, 2 deletions
diff --git a/CHANGELOG b/CHANGELOG
index 0816b4e..e4651e7 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -2,6 +2,10 @@
Changes for U-Boot 1.1.3:
======================================================================
+* Fix typos in cpu/85xx/start.S which caused DataTLB exception to be
+ routed to the Watchdog handler
+ Patch by Eugene Surovegin, 18 Jun 2005
+
* (re)enabled scsi commands do_scsi() and do_scsiboot()
Patch by Denis Peter, 06 Dec 2004
diff --git a/cpu/mpc85xx/start.S b/cpu/mpc85xx/start.S
index 7bca008..af28ebe 100644
--- a/cpu/mpc85xx/start.S
+++ b/cpu/mpc85xx/start.S
@@ -204,8 +204,8 @@ _start_e500:
li r1,0x0b00
mtspr IVOR11,r1 /* 11: Interval timer */
li r1,0x0c00
- mtspr IVOR12,r1 /* 11: Watchdog timer */
- li r10,0x0d00
+ mtspr IVOR12,r1 /* 12: Watchdog timer */
+ li r1,0x0d00
mtspr IVOR13,r1 /* 13: Data TLB error */
li r1,0x0e00
mtspr IVOR14,r1 /* 14: Instruction TLB error */