From 628bfd02cbbe8368c687603df8e679c8dd3e56f2 Mon Sep 17 00:00:00 2001
From: John Crispin <blogic@openwrt.org>
Date: Mon, 15 Apr 2013 09:45:09 +0000
Subject: [PATCH] --- yaml --- r: 375165 b: refs/heads/master c:
 9b75733b7b5e056a893f829262c2a2624a66d186 h: refs/heads/master i:   375163:
 8ddb51035870b0c91eff672f95a39b1dd4e36461 v: v3

---
 [refs]                        |  2 +-
 trunk/arch/mips/ath79/setup.c | 16 +---------------
 2 files changed, 2 insertions(+), 16 deletions(-)

diff --git a/[refs] b/[refs]
index 2b303212a632..c1f6b82690bc 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: dd63b00804a5c842fb73b6afc52f928f0c209a07
+refs/heads/master: 9b75733b7b5e056a893f829262c2a2624a66d186
diff --git a/trunk/arch/mips/ath79/setup.c b/trunk/arch/mips/ath79/setup.c
index d5b3c9057018..a0233a2c1988 100644
--- a/trunk/arch/mips/ath79/setup.c
+++ b/trunk/arch/mips/ath79/setup.c
@@ -51,20 +51,6 @@ static void ath79_halt(void)
 		cpu_wait();
 }
 
-static void __init ath79_detect_mem_size(void)
-{
-	unsigned long size;
-
-	for (size = ATH79_MEM_SIZE_MIN; size < ATH79_MEM_SIZE_MAX;
-	     size <<= 1) {
-		if (!memcmp(ath79_detect_mem_size,
-			    ath79_detect_mem_size + size, 1024))
-			break;
-	}
-
-	add_memory_region(0, size, BOOT_MEM_RAM);
-}
-
 static void __init ath79_detect_sys_type(void)
 {
 	char *chip = "????";
@@ -212,7 +198,7 @@ void __init plat_mem_setup(void)
 					 AR71XX_DDR_CTRL_SIZE);
 
 	ath79_detect_sys_type();
-	ath79_detect_mem_size();
+	detect_memory_region(0, ATH79_MEM_SIZE_MIN, ATH79_MEM_SIZE_MAX);
 	ath79_clocks_init();
 
 	_machine_restart = ath79_restart;