| 1 | From d8f83a608bc854dbbe6b2ea5436e9b34516af8e4 Mon Sep 17 00:00:00 2001 |
| 2 | From: John Crispin <blogic@openwrt.org> |
| 3 | Date: Thu, 6 Dec 2012 16:09:08 +0100 |
| 4 | Subject: [PATCH 121/123] owrt: lantiq dtb image hack |
| 5 | |
| 6 | --- |
| 7 | arch/mips/lantiq/prom.c | 4 +++- |
| 8 | 1 file changed, 3 insertions(+), 1 deletion(-) |
| 9 | |
| 10 | Index: linux-3.7-rc8/arch/mips/lantiq/prom.c |
| 11 | =================================================================== |
| 12 | --- linux-3.7-rc8.orig/arch/mips/lantiq/prom.c 2012-12-14 23:08:36.451576994 +0100 |
| 13 | +++ linux-3.7-rc8/arch/mips/lantiq/prom.c 2012-12-14 23:08:36.607576999 +0100 |
| 14 | @@ -72,6 +72,8 @@ |
| 15 | return 0; |
| 16 | } |
| 17 | |
| 18 | +extern struct boot_param_header __image_dtb; |
| 19 | + |
| 20 | void __init plat_mem_setup(void) |
| 21 | { |
| 22 | ioport_resource.start = IOPORT_RESOURCE_START; |
| 23 | @@ -85,7 +87,7 @@ |
| 24 | * Load the builtin devicetree. This causes the chosen node to be |
| 25 | * parsed resulting in our memory appearing |
| 26 | */ |
| 27 | - __dt_setup_arch(&__dtb_start); |
| 28 | + __dt_setup_arch(&__image_dtb); |
| 29 | |
| 30 | of_scan_flat_dt(early_init_dt_scan_model, NULL); |
| 31 | } |
| 32 | Index: linux-3.7-rc8/arch/mips/lantiq/Makefile |
| 33 | =================================================================== |
| 34 | --- linux-3.7-rc8.orig/arch/mips/lantiq/Makefile 2012-12-14 23:08:36.459576996 +0100 |
| 35 | +++ linux-3.7-rc8/arch/mips/lantiq/Makefile 2012-12-15 01:40:16.519805129 +0100 |
| 36 | @@ -6,8 +6,6 @@ |
| 37 | |
| 38 | obj-y := irq.o clk.o prom.o |
| 39 | |
| 40 | -obj-y += dts/ |
| 41 | - |
| 42 | obj-$(CONFIG_EARLY_PRINTK) += early_printk.o |
| 43 | |
| 44 | obj-$(CONFIG_SOC_TYPE_XWAY) += xway/ |
| 45 | |
