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