0d9f760f27
Includes memory allocation fixes as well as several networking fixes. Signed-off-by: Jonas Gorski <jogo@openwrt.org> SVN-Revision: 37103
52 lines
1.5 KiB
Diff
52 lines
1.5 KiB
Diff
From 6beb1af1b1475478c8f275b9579c9ebe4dad2904 Mon Sep 17 00:00:00 2001
|
|
From: John Crispin <blogic@openwrt.org>
|
|
Date: Tue, 19 Mar 2013 10:16:42 +0100
|
|
Subject: [PATCH 205/208] owrt: MIPS: add OWRTDTB secion
|
|
|
|
Signed-off-by: John Crispin <blogic@openwrt.org>
|
|
---
|
|
arch/mips/kernel/head.S | 3 +++
|
|
arch/mips/ralink/Makefile | 2 +-
|
|
arch/mips/ralink/of.c | 4 +++-
|
|
3 files changed, 7 insertions(+), 2 deletions(-)
|
|
|
|
--- a/arch/mips/kernel/head.S
|
|
+++ b/arch/mips/kernel/head.S
|
|
@@ -146,6 +146,9 @@ EXPORT(__image_cmdline)
|
|
.fill 0x400
|
|
#endif /* CONFIG_IMAGE_CMDLINE_HACK */
|
|
|
|
+ .ascii "OWRTDTB:"
|
|
+ EXPORT(__image_dtb)
|
|
+ .fill 0x4000
|
|
__REF
|
|
|
|
NESTED(kernel_entry, 16, sp) # kernel entry point
|
|
--- a/arch/mips/ralink/Makefile
|
|
+++ b/arch/mips/ralink/Makefile
|
|
@@ -17,4 +17,4 @@ obj-$(CONFIG_EARLY_PRINTK) += early_prin
|
|
|
|
obj-$(CONFIG_DEBUG_FS) += bootrom.o
|
|
|
|
-obj-y += dts/
|
|
+#obj-y += dts/
|
|
--- a/arch/mips/ralink/of.c
|
|
+++ b/arch/mips/ralink/of.c
|
|
@@ -83,6 +83,8 @@ void __init device_tree_init(void)
|
|
//free_bootmem(base, size);
|
|
}
|
|
|
|
+extern struct boot_param_header __image_dtb;
|
|
+
|
|
void __init plat_mem_setup(void)
|
|
{
|
|
set_io_port_base(KSEG1);
|
|
@@ -91,7 +93,7 @@ void __init plat_mem_setup(void)
|
|
* Load the builtin devicetree. This causes the chosen node to be
|
|
* parsed resulting in our memory appearing
|
|
*/
|
|
- __dt_setup_arch(&__dtb_start);
|
|
+ __dt_setup_arch(&__image_dtb);
|
|
|
|
if (soc_info.mem_size)
|
|
add_memory_region(soc_info.mem_base, soc_info.mem_size * SZ_1M,
|