openwrt/target/linux/lantiq/patches-3.7/0121-owrt-lantiq-dtb-image-...

41 lines
1.0 KiB
Diff
Raw Normal View History

2012-12-15 01:59:45 +00:00
From d8f83a608bc854dbbe6b2ea5436e9b34516af8e4 Mon Sep 17 00:00:00 2001
From: John Crispin <blogic@openwrt.org>
Date: Thu, 6 Dec 2012 16:09:08 +0100
Subject: [PATCH 121/123] owrt: lantiq dtb image hack
---
arch/mips/lantiq/prom.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
2013-01-28 17:44:20 +00:00
--- a/arch/mips/lantiq/prom.c
+++ b/arch/mips/lantiq/prom.c
@@ -72,6 +72,8 @@ int __init early_init_dt_scan_model(unsi
2012-12-15 01:59:45 +00:00
return 0;
}
+extern struct boot_param_header __image_dtb;
+
void __init plat_mem_setup(void)
{
ioport_resource.start = IOPORT_RESOURCE_START;
2013-01-28 17:44:20 +00:00
@@ -85,7 +87,7 @@ void __init plat_mem_setup(void)
2012-12-15 01:59:45 +00:00
* Load the builtin devicetree. This causes the chosen node to be
* parsed resulting in our memory appearing
*/
- __dt_setup_arch(&__dtb_start);
+ __dt_setup_arch(&__image_dtb);
of_scan_flat_dt(early_init_dt_scan_model, NULL);
}
2013-01-28 17:44:20 +00:00
--- a/arch/mips/lantiq/Makefile
+++ b/arch/mips/lantiq/Makefile
2012-12-15 01:59:45 +00:00
@@ -6,8 +6,6 @@
obj-y := irq.o clk.o prom.o
-obj-y += dts/
-
obj-$(CONFIG_EARLY_PRINTK) += early_printk.o
obj-$(CONFIG_SOC_TYPE_XWAY) += xway/