target/linux/ramips/patches-3.10/0031-owrt-MIPS-add-OWRTDTB-secion.patch

   1 From c174d2250e402399ad7dbdd57d51883d8804bba0 Mon Sep 17 00:00:00 2001
   2 From: John Crispin <blogic@openwrt.org>
   3 Date: Mon, 15 Jul 2013 00:40:37 +0200
   4 Subject: [PATCH 31/33] owrt: MIPS: add OWRTDTB secion
   5
   6 Signed-off-by: John Crispin <blogic@openwrt.org>
   7 ---
   8  arch/mips/kernel/head.S   |    3 +++
   9  arch/mips/ralink/Makefile |    2 +-
  10  arch/mips/ralink/of.c     |    4 +++-
  11  3 files changed, 7 insertions(+), 2 deletions(-)
  12
  13 diff --git a/arch/mips/kernel/head.S b/arch/mips/kernel/head.S
  14 index c61cdae..b4e55bb 100644
  15 --- a/arch/mips/kernel/head.S
  16 +++ b/arch/mips/kernel/head.S
  17 @@ -140,6 +140,9 @@ FEXPORT(__kernel_entry)
  18         j       kernel_entry
  19  #endif
  20
  21 +       .ascii  "OWRTDTB:"
  22 +       EXPORT(__image_dtb)
  23 +       .fill   0x4000
  24         __REF
  25
  26  NESTED(kernel_entry, 16, sp)                   # kernel entry point
  27 diff --git a/arch/mips/ralink/Makefile b/arch/mips/ralink/Makefile
  28 index 03af636..9b32626 100644
  29 --- a/arch/mips/ralink/Makefile
  30 +++ b/arch/mips/ralink/Makefile
  31 @@ -19,4 +19,4 @@ obj-$(CONFIG_EARLY_PRINTK) += early_printk.o
  32
  33  obj-$(CONFIG_DEBUG_FS) += bootrom.o
  34
  35 -obj-y += dts/
  36 +#obj-y += dts/
  37 diff --git a/arch/mips/ralink/of.c b/arch/mips/ralink/of.c
  38 index 2faf478..d87222f 100644
  39 --- a/arch/mips/ralink/of.c
  40 +++ b/arch/mips/ralink/of.c
  41 @@ -83,6 +83,8 @@ void __init device_tree_init(void)
  42         //free_bootmem(base, size);
  43  }
  44
  45 +extern struct boot_param_header __image_dtb;
  46 +
  47  void __init plat_mem_setup(void)
  48  {
  49         set_io_port_base(KSEG1);
  50 @@ -91,7 +93,7 @@ void __init plat_mem_setup(void)
  51          * Load the builtin devicetree. This causes the chosen node to be
  52          * parsed resulting in our memory appearing
  53          */
  54 -       __dt_setup_arch(&__dtb_start);
  55 +       __dt_setup_arch(&__image_dtb);
  56
  57         if (soc_info.mem_size)
  58                 add_memory_region(soc_info.mem_base, soc_info.mem_size * SZ_1M,
  59 --
  60 1.7.10.4
  61