Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

[sfrench/cifs-2.6.git] / arch / powerpc / boot / crt0.S

diff --git a/arch/powerpc/boot/crt0.S b/arch/powerpc/boot/crt0.S
index 70e65b13e0336fd86c02f3c602181be94c3ae3e0..5a4215c4b0146aa063fe87c5bb503a398232f6d3 100644 (file)
--- a/arch/powerpc/boot/crt0.S
+++ b/arch/powerpc/boot/crt0.S
@@ -16,8 +16,11 @@
 _zimage_start_opd:
        .long   _zimage_start, 0, 0, 0
 
+       .weak   _zimage_start
        .globl  _zimage_start
 _zimage_start:
+       .globl  _zimage_start_lib
+_zimage_start_lib:
        /* Work out the offset between the address we were linked at
           and the address where we're running. */
        bl      1f
@@ -44,7 +47,7 @@ _zimage_start:
        addi    r9,r9,4
        bdnz    2b
 
-       /* Do a cache flush for our text, in case OF didn't */
+       /* Do a cache flush for our text, in case the loader didn't */
 3:     lis     r9,_start@ha
        addi    r9,r9,_start@l
        add     r9,r0,r9
@@ -59,6 +62,34 @@ _zimage_start:
        sync
        isync
 
-       mr      r6,r1
-       b       start
+       /* Clear the BSS */
+       lis     r9,__bss_start@ha
+       addi    r9,r9,__bss_start@l
+       add     r9,r0,r9
+       lis     r8,_end@ha
+       addi    r8,r8,_end@l
+       add     r8,r0,r8
+       li      r10,0
+5:     stw     r10,0(r9)
+       addi    r9,r9,4
+       cmplw   cr0,r9,r8
+       blt     5b
 
+       /* Possibly set up a custom stack */
+.weak  _platform_stack_top
+       lis     r8,_platform_stack_top@ha
+       addi    r8,r8,_platform_stack_top@l
+       cmpwi   r8,0
+       beq     6f
+       add     r8,r0,r8
+       lwz     r1,0(r8)
+       add     r1,r0,r1
+       li      r0,0
+       stwu    r0,-16(r1)      /* establish a stack frame */
+6:
+
+       /* Call platform_init() */
+       bl      platform_init
+
+       /* Call start */
+       b       start