[POWERPC] bootwrapper: Add a firmware-independent simpleboot target.

This target produces a flat binary rather than an ELF file,
fixes the entry point at the beginning of the image, and takes
a complete device tree with no fixups needed.

Signed-off-by: Grant Likely <grant.likely@secretlab.ca>
Signed-off-by: Josh Boyer <jwboyer@linux.vnet.ibm.com>

diff --git a/arch/powerpc/boot/Makefile b/arch/powerpc/boot/Makefile
index a31d4e12b910f270270e17e1af7287860934f045..7dcd9e953a98483ddadb46c1113cf55e02af3caa 100644 (file)
--- a/arch/powerpc/boot/Makefile
+++ b/arch/powerpc/boot/Makefile
@@ -40,6 +40,7 @@ $(obj)/ebony.o: BOOTCFLAGS += -mcpu=405
 $(obj)/cuboot-taishan.o: BOOTCFLAGS += -mcpu=405
 $(obj)/cuboot-katmai.o: BOOTCFLAGS += -mcpu=405
 $(obj)/treeboot-walnut.o: BOOTCFLAGS += -mcpu=405
+$(obj)/virtex405-head.o: BOOTCFLAGS += -mcpu=405
 
 
 zlib       := inffast.c inflate.c inftrees.c
@@ -64,7 +65,8 @@ src-plat := of.c cuboot-52xx.c cuboot-824x.c cuboot-83xx.c cuboot-85xx.c holly.c
                cuboot-bamboo.c cuboot-mpc7448hpc2.c cuboot-taishan.c \
                fixed-head.S ep88xc.c ep405.c \
                cuboot-katmai.c cuboot-rainier.c redboot-8xx.c ep8248e.c \
-               cuboot-warp.c cuboot-85xx-cpm2.c cuboot-yosemite.c
+               cuboot-warp.c cuboot-85xx-cpm2.c cuboot-yosemite.c simpleboot.c \
+               virtex405-head.S
 src-boot := $(src-wlib) $(src-plat) empty.c
 
 src-boot := $(addprefix $(obj)/, $(src-boot))
@@ -307,6 +309,12 @@ $(obj)/uImage: vmlinux $(wrapperbits)
 $(obj)/cuImage.%: vmlinux $(obj)/%.dtb $(wrapperbits)
        $(call if_changed,wrap,cuboot-$*,,$(obj)/$*.dtb)
 
+$(obj)/simpleImage.initrd.%: vmlinux $(obj)/%.dtb $(wrapperbits)
+       $(call if_changed,wrap,simpleboot-$*,,$(obj)/$*.dtb,$(obj)/ramdisk.image.gz)
+
+$(obj)/simpleImage.%: vmlinux $(obj)/%.dtb $(wrapperbits)
+       $(call if_changed,wrap,simpleboot-$*,,$(obj)/$*.dtb)
+
 $(obj)/treeImage.initrd.%: vmlinux $(obj)/%.dtb $(wrapperbits)
        $(call if_changed,wrap,treeboot-$*,,$(obj)/$*.dtb,$(obj)/ramdisk.image.gz)
 

diff --git a/arch/powerpc/boot/simpleboot.c b/arch/powerpc/boot/simpleboot.c
new file mode 100644 (file)
index 0000000..86cd285
--- /dev/null
+++ b/arch/powerpc/boot/simpleboot.c
@@ -0,0 +1,84 @@
+/*
+ * The simple platform -- for booting when firmware doesn't supply a device
+ *                        tree or any platform configuration information.
+ *                        All data is extracted from an embedded device tree
+ *                        blob.
+ *
+ * Authors: Scott Wood <scottwood@freescale.com>
+ *          Grant Likely <grant.likely@secretlab.ca>
+ *
+ * Copyright (c) 2007 Freescale Semiconductor, Inc.
+ * Copyright (c) 2008 Secret Lab Technologies Ltd.
+ *
+ * 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 "types.h"
+#include "io.h"
+#include "stdio.h"
+#include "libfdt/libfdt.h"
+
+BSS_STACK(4*1024);
+
+void platform_init(unsigned long r3, unsigned long r4, unsigned long r5,
+                  unsigned long r6, unsigned long r7)
+{
+       const u32 *na, *ns, *reg, *timebase;
+       u64 memsize64;
+       int node, size, i;
+
+       /* Make sure FDT blob is sane */
+       if (fdt_check_header(_dtb_start) != 0)
+               fatal("Invalid device tree blob\n");
+
+       /* Find the #address-cells and #size-cells properties */
+       node = fdt_path_offset(_dtb_start, "/");
+       if (node < 0)
+               fatal("Cannot find root node\n");
+       na = fdt_getprop(_dtb_start, node, "#address-cells", &size);
+       if (!na || (size != 4))
+               fatal("Cannot find #address-cells property");
+       ns = fdt_getprop(_dtb_start, node, "#size-cells", &size);
+       if (!ns || (size != 4))
+               fatal("Cannot find #size-cells property");
+
+       /* Find the memory range */
+       node = fdt_node_offset_by_prop_value(_dtb_start, -1, "device_type",
+                                            "memory", sizeof("memory"));
+       if (node < 0)
+               fatal("Cannot find memory node\n");
+       reg = fdt_getprop(_dtb_start, node, "reg", &size);
+       if (size < (*na+*ns) * sizeof(u32))
+               fatal("cannot get memory range\n");
+
+       /* Only interested in memory based at 0 */
+       for (i = 0; i < *na; i++)
+               if (*reg++ != 0)
+                       fatal("Memory range is not based at address 0\n");
+
+       /* get the memsize and trucate it to under 4G on 32 bit machines */
+       memsize64 = 0;
+       for (i = 0; i < *ns; i++)
+               memsize64 = (memsize64 << 32) | *reg++;
+       if (sizeof(void *) == 4 && memsize64 >= 0x100000000ULL)
+               memsize64 = 0xffffffff;
+
+       /* finally, setup the timebase */
+       node = fdt_node_offset_by_prop_value(_dtb_start, -1, "device_type",
+                                            "cpu", sizeof("cpu"));
+       if (!node)
+               fatal("Cannot find cpu node\n");
+       timebase = fdt_getprop(_dtb_start, node, "timebase-frequency", &size);
+       if (timebase && (size == 4))
+               timebase_period_ns = 1000000000 / *timebase;
+
+       /* Now we have the memory size; initialize the heap */
+       simple_alloc_init(_end, memsize64 - (unsigned long)_end, 32, 64);
+
+       /* prepare the device tree and find the console */
+       fdt_init(_dtb_start);
+       serial_console_init();
+}

diff --git a/arch/powerpc/boot/virtex405-head.S b/arch/powerpc/boot/virtex405-head.S
new file mode 100644 (file)
index 0000000..3edb13f
--- /dev/null
+++ b/arch/powerpc/boot/virtex405-head.S
@@ -0,0 +1,30 @@
+#include "ppc_asm.h"
+
+       .text
+       .global _zimage_start
+_zimage_start:
+
+       /* PPC errata 213: needed by Virtex-4 FX */
+       mfccr0  0
+       oris    0,0,0x50000000@h
+       mtccr0  0
+
+       /*
+        * Invalidate the data cache if the data cache is turned off.
+        * - The 405 core does not invalidate the data cache on power-up
+        *   or reset but does turn off the data cache. We cannot assume
+        *   that the cache contents are valid.
+        * - If the data cache is turned on this must have been done by
+        *   a bootloader and we assume that the cache contents are
+        *   valid.
+        */
+       mfdccr  r9
+       cmplwi  r9,0
+       bne     2f
+       lis     r9,0
+       li      r8,256
+       mtctr   r8
+1:     dccci   r0,r9
+       addi    r9,r9,0x20
+       bdnz    1b
+2:     b       _zimage_start_lib

diff --git a/arch/powerpc/boot/wrapper b/arch/powerpc/boot/wrapper
index 087e120e490478f70b65fc66c4d3de0fa2ee63a9..14a01823ba53f6a190f546b2cbf1a5562c936d99 100755 (executable)
--- a/arch/powerpc/boot/wrapper
+++ b/arch/powerpc/boot/wrapper
@@ -199,6 +199,10 @@ adder875-redboot)
     platformo="$object/fixed-head.o $object/redboot-8xx.o"
     binary=y
     ;;
+simpleboot-virtex405-*)
+    platformo="$object/virtex405-head.o $object/simpleboot.o"
+    binary=y
+    ;;
 esac
 
 vmz="$tmpdir/`basename \"$kernel\"`.$ext"