diff options
Diffstat (limited to 'arch/powerpc/boot/cuboot-85xx.c')
-rw-r--r-- | arch/powerpc/boot/cuboot-85xx.c | 13 |
1 files changed, 2 insertions, 11 deletions
diff --git a/arch/powerpc/boot/cuboot-85xx.c b/arch/powerpc/boot/cuboot-85xx.c index e2560317f278..10f0f697c935 100644 --- a/arch/powerpc/boot/cuboot-85xx.c +++ b/arch/powerpc/boot/cuboot-85xx.c | |||
@@ -12,12 +12,12 @@ | |||
12 | 12 | ||
13 | #include "ops.h" | 13 | #include "ops.h" |
14 | #include "stdio.h" | 14 | #include "stdio.h" |
15 | #include "cuboot.h" | ||
15 | 16 | ||
16 | #define TARGET_85xx | 17 | #define TARGET_85xx |
17 | #include "ppcboot.h" | 18 | #include "ppcboot.h" |
18 | 19 | ||
19 | static bd_t bd; | 20 | static bd_t bd; |
20 | extern char _end[]; | ||
21 | extern char _dtb_start[], _dtb_end[]; | 21 | extern char _dtb_start[], _dtb_end[]; |
22 | 22 | ||
23 | static void platform_fixups(void) | 23 | static void platform_fixups(void) |
@@ -53,16 +53,7 @@ static void platform_fixups(void) | |||
53 | void platform_init(unsigned long r3, unsigned long r4, unsigned long r5, | 53 | void platform_init(unsigned long r3, unsigned long r4, unsigned long r5, |
54 | unsigned long r6, unsigned long r7) | 54 | unsigned long r6, unsigned long r7) |
55 | { | 55 | { |
56 | unsigned long end_of_ram = bd.bi_memstart + bd.bi_memsize; | 56 | CUBOOT_INIT(); |
57 | unsigned long avail_ram = end_of_ram - (unsigned long)_end; | ||
58 | |||
59 | memcpy(&bd, (bd_t *)r3, sizeof(bd)); | ||
60 | loader_info.initrd_addr = r4; | ||
61 | loader_info.initrd_size = r4 ? r5 - r4 : 0; | ||
62 | loader_info.cmdline = (char *)r6; | ||
63 | loader_info.cmdline_len = r7 - r6; | ||
64 | |||
65 | simple_alloc_init(_end, avail_ram - 1024*1024, 32, 64); | ||
66 | ft_init(_dtb_start, _dtb_end - _dtb_start, 32); | 57 | ft_init(_dtb_start, _dtb_end - _dtb_start, 32); |
67 | serial_console_init(); | 58 | serial_console_init(); |
68 | platform_ops.fixups = platform_fixups; | 59 | platform_ops.fixups = platform_fixups; |