target/linux/lantiq/patches-3.9/0017-owrt-lantiq-dtb-image-hack.patch

   1 From 34188b104874841296548a8c7e09d6e98771634f 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 17/22] 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 diff --git a/arch/mips/lantiq/Makefile b/arch/mips/lantiq/Makefile
  12 index d6bdc57..690257a 100644
  13 --- a/arch/mips/lantiq/Makefile
  14 +++ b/arch/mips/lantiq/Makefile
  15 @@ -6,8 +6,6 @@
  16
  17  obj-y := irq.o clk.o prom.o
  18
  19 -obj-y += dts/
  20 -
  21  obj-$(CONFIG_EARLY_PRINTK) += early_printk.o
  22
  23  obj-$(CONFIG_SOC_TYPE_XWAY) += xway/
  24 diff --git a/arch/mips/lantiq/prom.c b/arch/mips/lantiq/prom.c
  25 index 9f9e875..72b183a 100644
  26 --- a/arch/mips/lantiq/prom.c
  27 +++ b/arch/mips/lantiq/prom.c
  28 @@ -57,6 +57,8 @@ static void __init prom_init_cmdline(void)
  29         }
  30  }
  31
  32 +extern struct boot_param_header __image_dtb;
  33 +
  34  void __init plat_mem_setup(void)
  35  {
  36         ioport_resource.start = IOPORT_RESOURCE_START;
  37 @@ -70,7 +72,7 @@ void __init plat_mem_setup(void)
  38          * Load the builtin devicetree. This causes the chosen node to be
  39          * parsed resulting in our memory appearing
  40          */
  41 -       __dt_setup_arch(&__dtb_start);
  42 +       __dt_setup_arch(&__image_dtb);
  43  }
  44
  45  void __init device_tree_init(void)
  46 --
  47 1.7.10.4
  48