Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes...

[linux-2.6-omap-h63xx.git] / arch / powerpc / boot / cuboot-ebony.c

diff --git a/arch/powerpc/boot/cuboot-ebony.c b/arch/powerpc/boot/cuboot-ebony.c
index 4464c5f67acb7e3747acf7ef790a4a0b0e360ef6..56564ba37f62d1d7a7aba46ff94362627c8f8f69 100644 (file)
--- a/arch/powerpc/boot/cuboot-ebony.c
+++ b/arch/powerpc/boot/cuboot-ebony.c
@@ -15,28 +15,17 @@
 #include "ops.h"
 #include "stdio.h"
 #include "44x.h"
+#include "cuboot.h"
 
+#define TARGET_4xx
 #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);
 }