[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>

diff --git a/arch/powerpc/boot/Makefile b/arch/powerpc/boot/Makefile
index fa195fb..c6b8e13 100644 (file)
--- a/arch/powerpc/boot/Makefile
+++ b/arch/powerpc/boot/Makefile
@@ -44,7 +44,7 @@ $(addprefix $(obj)/,$(zlib) gunzip_util.o main.o): \
 src-wlib := string.S crt0.S stdio.c main.c flatdevtree.c flatdevtree_misc.c \
                ns16550.c serial.c simple_alloc.c div64.S util.S \
                gunzip_util.c elf_util.c $(zlib) devtree.c oflib.c ofconsole.c \
-               44x.c ebony.c mv64x60.c mpsc.c mv64x60_i2c.c
+               44x.c ebony.c mv64x60.c mpsc.c mv64x60_i2c.c cuboot.c
 src-plat := of.c cuboot-83xx.c cuboot-85xx.c holly.c \
                cuboot-ebony.c treeboot-ebony.c prpmc2800.c
 src-boot := $(src-wlib) $(src-plat) empty.c

diff --git a/arch/powerpc/boot/cuboot-83xx.c b/arch/powerpc/boot/cuboot-83xx.c
index 9af554e..296025d 100644 (file)
--- a/arch/powerpc/boot/cuboot-83xx.c
+++ b/arch/powerpc/boot/cuboot-83xx.c
@@ -12,12 +12,12 @@
 
 #include "ops.h"
 #include "stdio.h"
+#include "cuboot.h"
 
 #define TARGET_83xx
 #include "ppcboot.h"
 
 static bd_t bd;
-extern char _end[];
 extern char _dtb_start[], _dtb_end[];
 
 static void platform_fixups(void)
@@ -52,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 - r4 : 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;

diff --git a/arch/powerpc/boot/cuboot-85xx.c b/arch/powerpc/boot/cuboot-85xx.c
index e256031..10f0f69 100644 (file)
--- a/arch/powerpc/boot/cuboot-85xx.c
+++ b/arch/powerpc/boot/cuboot-85xx.c
@@ -12,12 +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 +53,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 - r4 : 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;

diff --git a/arch/powerpc/boot/cuboot-ebony.c b/arch/powerpc/boot/cuboot-ebony.c
index 4464c5f..c5f37ce 100644 (file)
--- 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);
 }

diff --git a/arch/powerpc/boot/cuboot.c b/arch/powerpc/boot/cuboot.c
new file mode 100644 (file)
index 0000000..6579546
--- /dev/null
+++ b/arch/powerpc/boot/cuboot.c
@@ -0,0 +1,35 @@
+/*
+ * Compatibility for old (not device tree aware) U-Boot versions
+ *
+ * Author: Scott Wood <scottwood@freescale.com>
+ * Consolidated using macros by David Gibson <david@gibson.dropbear.id.au>
+ *
+ * Copyright 2007 David Gibson, IBM Corporation.
+ * Copyright (c) 2007 Freescale Semiconductor, Inc.
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 as published
+ * by the Free Software Foundation.
+ */
+
+#include "ops.h"
+#include "stdio.h"
+
+#include "ppcboot.h"
+
+extern char _end[];
+extern char _dtb_start[], _dtb_end[];
+
+void cuboot_init(unsigned long r4, unsigned long r5,
+                unsigned long r6, unsigned long r7,
+                unsigned long end_of_ram)
+{
+       unsigned long avail_ram = end_of_ram - (unsigned long)_end;
+
+       loader_info.initrd_addr = r4;
+       loader_info.initrd_size = r4 ? r5 - r4 : 0;
+       loader_info.cmdline = (char *)r6;
+       loader_info.cmdline_len = r7 - r6;
+
+       simple_alloc_init(_end, avail_ram - 1024*1024, 32, 64);
+}

diff --git a/arch/powerpc/boot/cuboot.h b/arch/powerpc/boot/cuboot.h
new file mode 100644 (file)
index 0000000..cd2aa7f
--- /dev/null
+++ b/arch/powerpc/boot/cuboot.h
@@ -0,0 +1,14 @@
+#ifndef _PPC_BOOT_CUBOOT_H_
+#define _PPC_BOOT_CUBOOT_H_
+
+void cuboot_init(unsigned long r4, unsigned long r5,
+                unsigned long r6, unsigned long r7,
+                unsigned long end_of_ram);
+
+#define CUBOOT_INIT() \
+       do { \
+               memcpy(&bd, (bd_t *)r3, sizeof(bd)); \
+               cuboot_init(r4, r5, r6, r7, bd.bi_memstart + bd.bi_memsize); \
+       } while (0)
+
+#endif /* _PPC_BOOT_CUBOOT_H_ */