[POWERPC] Consolidate cuboot initialization code

The various cuboot platforms (i.e. pre-device tree aware u-boot for
83xx, 85xx and Ebony) share a certain amount of code for parsing the
boot parameters.  To a certain extent that's inevitable, since they
platforms have different definitions of the bd_t structure.  However,
with some macro work and a helper function, this patch improves the
situation a bit.

In the process, this fixes a bug on Ebony, which was incorrectly
handling the parameters passed form u-boot for the command line (the
bug was copied from 83xx and 85xx which have subsequently been fixed).

Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
Signed-off-by: Paul Mackerras <paulus@samba.org>

1 files changed, 2 insertions, 14 deletions

diff --git a/arch/powerpc/boot/cuboot-ebony.c b/arch/powerpc/boot/cuboot-ebony.c
index 4464c5f67acb..c5f37ce172ea 100644
--- a/arch/powerpc/boot/cuboot-ebony.c
+++ b/arch/powerpc/boot/cuboot-ebony.c
@@ -15,28 +15,16 @@
 #include "ops.h"
 #include "stdio.h"
 #include "44x.h"
+#include "cuboot.h"
 
 #define TARGET_44x
 #include "ppcboot.h"
 
 static bd_t bd;
-extern char _end[];
-
-BSS_STACK(4096);
 
 void platform_init(unsigned long r3, unsigned long r4, unsigned long r5,
                    unsigned long r6, unsigned long r7)
 {
-        unsigned long end_of_ram = bd.bi_memstart + bd.bi_memsize;
-        unsigned long avail_ram = end_of_ram - (unsigned long)_end;
-
-        memcpy(&bd, (bd_t *)r3, sizeof(bd));
-        loader_info.initrd_addr = r4;
-        loader_info.initrd_size = r4 ? r5 : 0;
-        loader_info.cmdline = (char *)r6;
-        loader_info.cmdline_len = r7 - r6;
-
-        simple_alloc_init(_end, avail_ram, 32, 64);
-
+        CUBOOT_INIT();
         ebony_init(&bd.bi_enetaddr, &bd.bi_enet1addr);
 }