tools: install a fake empty ldconfig script to prevent the system ldconfig from messi...
[openwrt.git] / target / linux / ramips / patches-3.10 / 0300-MIPS-OWRTDTB.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 --- a/arch/mips/kernel/head.S
14 +++ b/arch/mips/kernel/head.S
15 @@ -146,6 +146,9 @@ EXPORT(__image_cmdline)
16         .fill   0x400
17  #endif /* CONFIG_IMAGE_CMDLINE_HACK */
18  
19 +       .ascii  "OWRTDTB:"
20 +       EXPORT(__image_dtb)
21 +       .fill   0x4000
22         __REF
23  
24  NESTED(kernel_entry, 16, sp)                   # kernel entry point
25 --- a/arch/mips/ralink/Makefile
26 +++ b/arch/mips/ralink/Makefile
27 @@ -26,4 +26,4 @@ obj-$(CONFIG_EARLY_PRINTK) += early_prin
28  
29  obj-$(CONFIG_DEBUG_FS) += bootrom.o
30  
31 -obj-y += dts/
32 +#obj-y += dts/
33 --- a/arch/mips/ralink/of.c
34 +++ b/arch/mips/ralink/of.c
35 @@ -90,6 +90,8 @@ static int __init early_init_dt_find_mem
36         return 0;
37  }
38  
39 +extern struct boot_param_header __image_dtb;
40 +
41  void __init plat_mem_setup(void)
42  {
43         set_io_port_base(KSEG1);
44 @@ -98,7 +100,7 @@ void __init plat_mem_setup(void)
45          * Load the builtin devicetree. This causes the chosen node to be
46          * parsed resulting in our memory appearing
47          */
48 -       __dt_setup_arch(&__dtb_start);
49 +       __dt_setup_arch(&__image_dtb);
50  
51         of_scan_flat_dt(early_init_dt_find_memory, NULL);
52         if (memory_dtb)