diff options
| author | John Crispin <john@openwrt.org> | 2014-03-18 19:21:56 +0000 |
|---|---|---|
| committer | John Crispin <john@openwrt.org> | 2014-03-18 19:21:56 +0000 |
| commit | 332b94fbd524b944d2296b8ae0bf3db90a64ac90 (patch) | |
| tree | 4eef4c2285c01b870a57a2f663612a4fe53df534 /target/linux/ramips/patches-3.10/999-memory-detect.patch | |
| parent | 8a97da18e00ac36bdb5871d903044fc9b0826bfd (diff) | |
| download | upstream-332b94fbd524b944d2296b8ae0bf3db90a64ac90.tar.gz upstream-332b94fbd524b944d2296b8ae0bf3db90a64ac90.tar.bz2 upstream-332b94fbd524b944d2296b8ae0bf3db90a64ac90.zip | |
ralink: refresh patches
Signed-off-by: John Crispin <blogic@openwrt.org>
SVN-Revision: 39949
Diffstat (limited to 'target/linux/ramips/patches-3.10/999-memory-detect.patch')
| -rw-r--r-- | target/linux/ramips/patches-3.10/999-memory-detect.patch | 32 |
1 files changed, 0 insertions, 32 deletions
diff --git a/target/linux/ramips/patches-3.10/999-memory-detect.patch b/target/linux/ramips/patches-3.10/999-memory-detect.patch deleted file mode 100644 index 165a1f0ded..0000000000 --- a/target/linux/ramips/patches-3.10/999-memory-detect.patch +++ /dev/null @@ -1,32 +0,0 @@ ---- a/arch/mips/ralink/of.c -+++ b/arch/mips/ralink/of.c -@@ -80,6 +80,16 @@ void __init device_tree_init(void) - } - - 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 @@ void __init plat_mem_setup(void) - * 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 |