* Code cleanup:

[oweals/u-boot.git] / cpu / mpc8260 / start.S

diff --git a/cpu/mpc8260/start.S b/cpu/mpc8260/start.S
index 0e6b963f1616398f6f12cfd496fcabd9d0617e13..d3fd8652dc873f635d40f3afbe6aefb654959199 100644 (file)
--- a/cpu/mpc8260/start.S
+++ b/cpu/mpc8260/start.S
@@ -161,6 +161,7 @@ _hrcw_table:
        .globl  _start
 _start:
        li      r21, BOOTFLAG_COLD      /* Normal Power-On: Boot from FLASH*/
+       nop
        b       boot_cold
 
        . = EXC_OFF_SYS_RESET + 0x10
@@ -171,6 +172,18 @@ _start_warm:
        b       boot_warm
 
 boot_cold:
+#if defined(CONFIG_MPC8260ADS)
+       lis     r3, CFG_DEFAULT_IMMR@h
+       nop
+       lwz     r4, 0(r3)
+       nop
+       rlwinm  r4, r4, 0, 8, 5
+       nop
+       oris    r4, r4, 0x0200
+       nop
+       stw     r4, 0(r3)
+       nop
+#endif /* CONFIG_MPC8260ADS */
 boot_warm:
        mfmsr   r5                      /* save msr contents            */
 
@@ -953,8 +966,8 @@ in_ram:
        /*
         * Relocation Function, r14 point to got2+0x8000
         *
-         * Adjust got2 pointers, no need to check for 0, this code
-         * already puts a few entries in the table.
+        * Adjust got2 pointers, no need to check for 0, this code
+        * already puts a few entries in the table.
         */
        li      r0,__got2_entries@sectoff@l
        la      r3,GOT(_GOT2_TABLE_)
@@ -968,7 +981,7 @@ in_ram:
        bdnz    1b
 
        /*
-         * Now adjust the fixups and the pointers to the fixups
+        * Now adjust the fixups and the pointers to the fixups
         * in case we need to move ourselves again.
         */
 2:     li      r0,__fixup_entries@sectoff@l