target/linux/lantiq/patches-3.6/0201-lantiq-dtb-image-hack.patch

   1 From a86a157eb87fb21a62205a5382842c2f331fb473 Mon Sep 17 00:00:00 2001
   2 From: John Crispin <blogic@openwrt.org>
   3 Date: Fri, 2 Nov 2012 15:40:34 +0100
   4 Subject: [PATCH 201/201] lantiq: dtb image hack
   5
   6 ---
   7  arch/mips/lantiq/Kconfig |   12 ------------
   8  arch/mips/lantiq/prom.c  |    4 +++-
   9  2 files changed, 3 insertions(+), 13 deletions(-)
  10
  11 diff --git a/arch/mips/lantiq/Kconfig b/arch/mips/lantiq/Kconfig
  12 index c9d0984..bef648f 100644
  13 --- a/arch/mips/lantiq/Kconfig
  14 +++ b/arch/mips/lantiq/Kconfig
  15 @@ -24,18 +24,6 @@ config SOC_FALCON
  16
  17  endchoice
  18
  19 -choice
  20 -       prompt "Devicetree"
  21 -
  22 -config DT_EASY50712
  23 -       bool "Easy50712"
  24 -       depends on SOC_XWAY
  25 -
  26 -config DT_EASY80920
  27 -       bool "Easy80920"
  28 -       depends on SOC_XWAY
  29 -endchoice
  30 -
  31  config PCI_LANTIQ
  32         bool "PCI Support"
  33         depends on SOC_XWAY && PCI
  34 diff --git a/arch/mips/lantiq/prom.c b/arch/mips/lantiq/prom.c
  35 index 9f9e875..72b183a 100644
  36 --- a/arch/mips/lantiq/prom.c
  37 +++ b/arch/mips/lantiq/prom.c
  38 @@ -57,6 +57,8 @@ static void __init prom_init_cmdline(void)
  39         }
  40  }
  41
  42 +extern struct boot_param_header __image_dtb;
  43 +
  44  void __init plat_mem_setup(void)
  45  {
  46         ioport_resource.start = IOPORT_RESOURCE_START;
  47 @@ -70,7 +72,7 @@ void __init plat_mem_setup(void)
  48          * Load the builtin devicetree. This causes the chosen node to be
  49          * parsed resulting in our memory appearing
  50          */
  51 -       __dt_setup_arch(&__dtb_start);
  52 +       __dt_setup_arch(&__image_dtb);
  53  }
  54
  55  void __init device_tree_init(void)
  56 --
  57 1.7.10.4
  58