powerpc: Merge in the ppc64 version of the prom code.

This brings in the ppc64 version of prom_init.c, prom.c and btext.c
and makes them work for ppc32.  This also brings in the new calling
convention, where the first entry to the kernel (with r5 != 0) goes
to the prom_init code, which then restarts from the beginning (with
r5 == 0) after it has done its stuff.

For now this also brings in the ppc32 version of setup.c.  It also
merges lmb.h.

Signed-off-by: Paul Mackerras <paulus@samba.org>

1 files changed, 7 insertions, 9 deletions

diff --git a/arch/powerpc/kernel/head.S b/arch/powerpc/kernel/head.S
index 2c3a1d34e3c7..d49bff1a7d51 100644
--- a/arch/powerpc/kernel/head.S
+++ b/arch/powerpc/kernel/head.S
@@ -134,11 +134,13 @@ __start:
  * because OF may have I/O devices mapped into that area
  * (particularly on CHRP).
  */
-        mr      r31,r3                  /* save parameters */
+        cmpwi   0,r5,0
+        beq     1f
+        bl      prom_init
+        trap
+
+1:      mr      r31,r3                  /* save parameters */
         mr      r30,r4
-        mr      r29,r5
-        mr      r28,r6
-        mr      r27,r7
         li      r24,0                   /* cpu # */
 
 /*
@@ -204,8 +206,7 @@ __after_mmu_off:
  * On CHRP, we are loaded at 0x10000 since OF on CHRP uses
  * the exception vectors at 0 (and therefore this copy
  * overwrites OF's exception vectors with our own).
- * If the MMU is already turned on, we copy stuff to KERNELBASE,
- * otherwise we copy it to 0.
+ * The MMU is off at this point.
  */
         bl      reloc_offset
         mr      r26,r3
@@ -1187,9 +1188,6 @@ start_here:
  */
         mr      r3,r31
         mr      r4,r30
-        mr      r5,r29
-        mr      r6,r28
-        mr      r7,r27
         bl      machine_init
         bl      MMU_init