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

   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 --- a/arch/mips/lantiq/prom.c
  11 +++ b/arch/mips/lantiq/prom.c
  12 @@ -72,6 +72,8 @@ int __init early_init_dt_scan_model(unsi
  13         return 0;
  14  }
  15
  16 +extern struct boot_param_header __image_dtb;
  17 +
  18  void __init plat_mem_setup(void)
  19  {
  20         ioport_resource.start = IOPORT_RESOURCE_START;
  21 @@ -85,7 +87,7 @@ void __init plat_mem_setup(void)
  22          * Load the builtin devicetree. This causes the chosen node to be
  23          * parsed resulting in our memory appearing
  24          */
  25 -       __dt_setup_arch(&__dtb_start);
  26 +       __dt_setup_arch(&__image_dtb);
  27
  28         of_scan_flat_dt(early_init_dt_scan_model, NULL);
  29  }
  30 --- a/arch/mips/lantiq/Makefile
  31 +++ b/arch/mips/lantiq/Makefile
  32 @@ -6,8 +6,6 @@
  33
  34  obj-y := irq.o clk.o prom.o
  35
  36 -obj-y += dts/
  37 -
  38  obj-$(CONFIG_EARLY_PRINTK) += early_printk.o
  39
  40  obj-$(CONFIG_SOC_TYPE_XWAY) += xway/