From: blogic <blogic@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Date: Sun, 12 Jan 2014 12:07:26 +0000 (+0000)
Subject: ralink: honour memory@0 node
X-Git-Tag: fast2504n-3.10.28-merged~360
X-Git-Url: https://git.enpas.org/?a=commitdiff_plain;h=4625993367e6aec13050b1de7e9a70763832ff08;p=openwrt.git

ralink: honour memory@0 node

Signed-off-by: John Crispin <blogic@openwrt.org>

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@39234 3c298f89-4303-0410-b956-a3cf2f4a3e73
---

diff --git a/target/linux/ramips/patches-3.10/999-memory-detect.patch b/target/linux/ramips/patches-3.10/999-memory-detect.patch
new file mode 100644
index 0000000000..2e857fbc44
--- /dev/null
+++ b/target/linux/ramips/patches-3.10/999-memory-detect.patch
@@ -0,0 +1,34 @@
+Index: linux-3.10.26/arch/mips/ralink/of.c
+===================================================================
+--- linux-3.10.26.orig/arch/mips/ralink/of.c	2014-01-12 11:49:40.292069849 +0100
++++ linux-3.10.26/arch/mips/ralink/of.c	2014-01-12 12:38:01.236138974 +0100
+@@ -80,6 +80,16 @@
+ }
+ 
+ extern struct boot_param_header __image_dtb;
++static int memory_dtb;
++
++static int __init early_init_dt_find_memory(unsigned long node, const char *uname,
++				     int depth, void *data)
++{
++	if (depth == 1 && !strcmp(uname, "memory@0"))
++		memory_dtb = 1;
++
++	return 0;
++}
+ 
+ void __init plat_mem_setup(void)
+ {
+@@ -90,8 +100,10 @@
+ 	 * parsed resulting in our memory appearing
+ 	 */
+ 	__dt_setup_arch(&__image_dtb);
+-
+-	if (soc_info.mem_size)
++	of_scan_flat_dt(early_init_dt_find_memory, NULL);
++	if (memory_dtb)
++		of_scan_flat_dt(early_init_dt_scan_memory, NULL);
++	else if (soc_info.mem_size)
+ 		add_memory_region(soc_info.mem_base, soc_info.mem_size * SZ_1M,
+ 				  BOOT_MEM_RAM);
+ 	else