[POWERPC] bootwrapper: Move linker symbols into ops.h

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

diff --git a/arch/powerpc/boot/cuboot-85xx.c b/arch/powerpc/boot/cuboot-85xx.c
index f88ba00ac1223393e6ab6aff863b205979f8c007..345dcbecef0fc81d14a41e1d14bf85bec2410afb 100644 (file)
--- a/arch/powerpc/boot/cuboot-85xx.c
+++ b/arch/powerpc/boot/cuboot-85xx.c
@@ -12,13 +12,12 @@
 
 #include "ops.h"
 #include "stdio.h"
+#include "cuboot.h"
 
 #define TARGET_85xx
 #include "ppcboot.h"
 
 static bd_t bd;
-extern char _end[];
-extern char _dtb_start[], _dtb_end[];
 
 static void platform_fixups(void)
 {
@@ -53,16 +52,7 @@ static void platform_fixups(void)
 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 - 1024*1024, 32, 64);
+       CUBOOT_INIT();
        ft_init(_dtb_start, _dtb_end - _dtb_start, 32);
        serial_console_init();
        platform_ops.fixups = platform_fixups;