Merge with git://www.denx.de/git/u-boot.git

[u-boot] / cpu / mpc8xx / start.S

diff --git a/cpu/mpc8xx/start.S b/cpu/mpc8xx/start.S
index cdd549fc74f2bb8a419186237758e0a8670a3f05..eca4b50626dce0f6ef3f175d9e23a9d4d85b6708 100644 (file)
--- a/cpu/mpc8xx/start.S
+++ b/cpu/mpc8xx/start.S
@@ -27,12 +27,12 @@
  *
  *  The processor starts at 0x00000100 and the code is executed
  *  from flash. The code is organized to be at an other address
- *  in memory, but as long we don't jump around before relocating.
+ *  in memory, but as long we don't jump around before relocating,
  *  board_init lies at a quite high address and when the cpu has
  *  jumped there, everything is ok.
  *  This works because the cpu gives the FLASH (CS0) the whole
  *  address space at startup, and board_init lies as a echo of
- *  the flash somewhere up there in the memorymap.
+ *  the flash somewhere up there in the memory map.
  *
  *  board_init will change CS0 to be positioned at the correct
  *  address and (s)dram will be positioned at address 0
@@ -76,9 +76,6 @@
        GOT_ENTRY(__init_end)
        GOT_ENTRY(_end)
        GOT_ENTRY(__bss_start)
-#if defined(CONFIG_ICU862)
-       GOT_ENTRY(environment)
-#endif
        END_GOT
 
 /*
@@ -227,7 +224,7 @@ _start_of_vectors:
 /* Alignment exception. */
        . = 0x600
 Alignment:
-       EXCEPTION_PROLOG
+       EXCEPTION_PROLOG(SRR0, SRR1)
        mfspr   r4,DAR
        stw     r4,_DAR(r21)
        mfspr   r5,DSISR
@@ -245,7 +242,7 @@ Alignment:
 /* Program check exception */
        . = 0x700
 ProgramCheck:
-       EXCEPTION_PROLOG
+       EXCEPTION_PROLOG(SRR0, SRR1)
        addi    r3,r1,STACK_FRAME_OVERHEAD
        li      r20,MSR_KERNEL
        rlwimi  r20,r23,0,16,16         /* copy EE bit from saved MSR */
@@ -617,16 +614,7 @@ clear_bss:
         * Now clear BSS segment
         */
        lwz     r3,GOT(__bss_start)
-#if defined(CONFIG_ICU862)
-       /*
-        * For the FADS - the environment is the very last item in flash.
-        * The real .bss stops just before environment starts, so only
-        * clear up to that point.
-        */
-       lwz     r4,GOT(environment)
-#else
        lwz     r4,GOT(_end)
-#endif
 
        cmplw   0, r3, r4
        beq     6f