kernel/3.10: refresh all target patches
[openwrt/staging/lynxis/omap.git] / target / linux / lantiq / patches-3.10 / 0006-MIPS-lantiq-dtb-image-hack.patch
1 From 7d62b24b4d94dabadeed552d84ac2665d53a802f Mon Sep 17 00:00:00 2001
2 From: John Crispin <blogic@openwrt.org>
3 Date: Wed, 13 Mar 2013 09:36:16 +0100
4 Subject: [PATCH 06/34] MIPS: lantiq: dtb image hack
5
6 Signed-off-by: John Crispin <blogic@openwrt.org>
7 ---
8 arch/mips/lantiq/Makefile | 2 --
9 arch/mips/lantiq/prom.c | 4 +++-
10 2 files changed, 3 insertions(+), 3 deletions(-)
11
12 --- a/arch/mips/lantiq/Makefile
13 +++ b/arch/mips/lantiq/Makefile
14 @@ -6,8 +6,6 @@
15
16 obj-y := irq.o clk.o prom.o
17
18 -obj-y += dts/
19 -
20 obj-$(CONFIG_EARLY_PRINTK) += early_printk.o
21
22 obj-$(CONFIG_SOC_TYPE_XWAY) += xway/
23 --- a/arch/mips/lantiq/prom.c
24 +++ b/arch/mips/lantiq/prom.c
25 @@ -57,6 +57,8 @@ static void __init prom_init_cmdline(voi
26 }
27 }
28
29 +extern struct boot_param_header __image_dtb;
30 +
31 void __init plat_mem_setup(void)
32 {
33 ioport_resource.start = IOPORT_RESOURCE_START;
34 @@ -70,7 +72,7 @@ void __init plat_mem_setup(void)
35 * Load the builtin devicetree. This causes the chosen node to be
36 * parsed resulting in our memory appearing
37 */
38 - __dt_setup_arch(&__dtb_start);
39 + __dt_setup_arch(&__image_dtb);
40 }
41
42 void __init device_tree_init(void)