Merge with /home/sr/git/u-boot

[platform/kernel/u-boot.git] / cpu / mpc85xx / start.S

diff --git a/cpu/mpc85xx/start.S b/cpu/mpc85xx/start.S
index dd81899..5f75bc1 100644 (file)
--- a/cpu/mpc85xx/start.S
+++ b/cpu/mpc85xx/start.S
@@ -155,11 +155,13 @@ _start_e500:
        mtspr   MCSR,r0
        mtspr   DEAR,r0
 
-       mtspr   DBCR0,r0
+       /* not needed and conflicts with some debuggers */
+       /* mtspr        DBCR0,r0 */
        mtspr   DBCR1,r0
        mtspr   DBCR2,r0
-       mtspr   IAC1,r0
-       mtspr   IAC2,r0
+       /* not needed and conflicts with some debuggers */
+       /* mtspr        IAC1,r0 */
+       /* mtspr        IAC2,r0 */
        mtspr   DAC1,r0
        mtspr   DAC2,r0
 
@@ -207,8 +209,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 */