---

yaml --- r: 332271 b: refs/heads/master c: 1f8a9ef h: refs/heads/master i: 332269: 898b425 332267: e85253a 332263: 5ce6b90 332255: c4ec62a v: v3
git-mirror · Aug 22, 2012 · 7b48d5e · 7b48d5e
1 parent 60e2d55
commit 7b48d5e
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 36 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 98dbc5764d8b6fa9cabe316fe725281703bf0fc6
+refs/heads/master: 1f8a9ef10732c96b5f898eacd5603c07dcc68b32
diff --git a/trunk/arch/mips/netlogic/xlp/Makefile b/trunk/arch/mips/netlogic/xlp/Makefile
@@ -1,4 +1,3 @@
 obj-y				+= setup.o platform.o nlm_hal.o
-obj-$(CONFIG_OF)		+= of.o
 obj-$(CONFIG_SMP)		+= wakeup.o
 obj-$(CONFIG_USB)		+= usb-init.o
diff --git a/trunk/arch/mips/netlogic/xlp/of.c b/trunk/arch/mips/netlogic/xlp/of.c
diff --git a/trunk/arch/mips/netlogic/xlp/setup.c b/trunk/arch/mips/netlogic/xlp/setup.c
@@ -35,6 +35,7 @@
 #include <linux/kernel.h>
 #include <linux/serial_8250.h>
 #include <linux/pm.h>
+#include <linux/bootmem.h>
 
 #include <asm/reboot.h>
 #include <asm/time.h>
@@ -112,6 +113,25 @@ void __init prom_init(void)
 #endif
 }
 
+void __init device_tree_init(void)
+{
+	unsigned long base, size;
+
+	if (!initial_boot_params)
+		return;
+
+	base = virt_to_phys((void *)initial_boot_params);
+	size = be32_to_cpu(initial_boot_params->totalsize);
+
+	/* Before we do anything, lets reserve the dt blob */
+	reserve_bootmem(base, size, BOOTMEM_DEFAULT);
+
+	unflatten_device_tree();
+
+	/* free the space reserved for the dt blob */
+	free_bootmem(base, size);
+}
+
 static struct of_device_id __initdata xlp_ids[] = {
 	{ .compatible = "simple-bus", },
 	{},