target/linux/lantiq/patches-3.8/0036-owrt-lantiq-dtb-image-hack.patch

   1 From 5128799df668a7ff5b2861fab39f9f788369eb43 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 36/40] owrt: lantiq dtb image hack
   5
   6 ---
   7  arch/mips/lantiq/Makefile |    2 --
   8  arch/mips/lantiq/prom.c   |    4 +++-
   9  2 files changed, 3 insertions(+), 3 deletions(-)
  10
  11 --- a/arch/mips/lantiq/Makefile
  12 +++ b/arch/mips/lantiq/Makefile
  13 @@ -6,8 +6,6 @@
  14
  15  obj-y := irq.o clk.o prom.o
  16
  17 -obj-y += dts/
  18 -
  19  obj-$(CONFIG_EARLY_PRINTK) += early_printk.o
  20
  21  obj-$(CONFIG_SOC_TYPE_XWAY) += xway/
  22 --- a/arch/mips/lantiq/prom.c
  23 +++ b/arch/mips/lantiq/prom.c
  24 @@ -57,6 +57,8 @@ static void __init prom_init_cmdline(voi
  25         }
  26  }
  27
  28 +extern struct boot_param_header __image_dtb;
  29 +
  30  void __init plat_mem_setup(void)
  31  {
  32         ioport_resource.start = IOPORT_RESOURCE_START;
  33 @@ -70,7 +72,7 @@ void __init plat_mem_setup(void)
  34          * Load the builtin devicetree. This causes the chosen node to be
  35          * parsed resulting in our memory appearing
  36          */
  37 -       __dt_setup_arch(&__dtb_start);
  38 +       __dt_setup_arch(&__image_dtb);
  39  }
  40
  41  void __init device_tree_init(void)