1 files changed, 2 insertions, 46 deletions
diff --git a/src/mainboard/emulation/qemu-armv7/cbmem.c b/src/mainboard/emulation/qemu-armv7/cbmem.c
index 927bd42d54..542e08d05e 100644
--- a/src/mainboard/emulation/qemu-armv7/cbmem.c
+++ b/src/mainboard/emulation/qemu-armv7/cbmem.c
@@ -11,55 +11,11 @@
  * GNU General Public License for more details.
  */
 
-#include <stddef.h>
 #include <cbmem.h>
 #include <symbols.h>
-#include <device/mmio.h>
-#include "mainboard.h"
-
-#define PATTERN1 0x55
-#define PATTERN2 0xaa
-
-/* Returns 1 if mebibyte mb is present and 0 otherwise.  */
-static int probe_mb(int mb)
-{
-	char *ptr = (char *) 0x60000000 + (mb << 20) + 0xfffff;
-	char old;
-	if (ptr < (char *) &_eprogram) {
-		/* Don't probe below _end to avoid accidentally clobering
-		   oneself.  */
-		return 1;
-	}
-
-	old = read8(ptr);
-	write8(ptr, PATTERN1);
-	if (read8(ptr) != PATTERN1)
-		return 0;
-	write8(ptr, PATTERN2);
-	if (read8(ptr) != PATTERN2)
-		return 0;
-	write8(ptr, old);
-	return 1;
-}
-
-int probe_ramsize(void)
-{
-	int i;
-	int discovered = 0;
-	static int saved_result;
-	if (saved_result)
-		return saved_result;
-	/* Compact binary search.  */
-	/* 1 GiB is the largest supported RAM by this machine.  */
-	for (i = 9; i >= 0; i--)
-		if (probe_mb(discovered | (1 << i)))
-			discovered |= (1 << i);
-	discovered++;
-	saved_result = discovered;
-	return discovered;
-}
+#include <ramdetect.h>
 
 void *cbmem_top(void)
 {
-	return _dram + (probe_ramsize() << 20);
+	return _dram + (probe_ramsize((uintptr_t)_dram, CONFIG_DRAM_SIZE_MB) * MiB);
 }