From bd4bcab8addf8791a9100140ae963415450b9663 Mon Sep 17 00:00:00 2001
From: Patrick Rudolph <patrick.rudolph@9elements.com>
Date: Sun, 30 Jun 2019 22:12:15 +0200
Subject: lib: Rewrite qemu-armv7 ramdetect

* Move armv7 RAM dection to a common place
* Enable it for all emulated platforms
* Use 32bit probe values and restore memory even on failure
* Use the new logic on the following boards:
** qemu-armv7
** qemu-riscv

Tested on qemu-system-riscv:
Fixes kernel panic due to wrong memory limits reported.

Change-Id: I37386c6a95bfc3b7b25aeae32c6e14cff9913513
Signed-off-by: Patrick Rudolph <patrick.rudolph@9elements.com>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/33934
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Angel Pons <th3fanbus@gmail.com>
---
 src/soc/ucb/riscv/cbmem.c | 12 +++---------
 1 file changed, 3 insertions(+), 9 deletions(-)

(limited to 'src/soc/ucb/riscv')

diff --git a/src/soc/ucb/riscv/cbmem.c b/src/soc/ucb/riscv/cbmem.c
index 2ee400ab8b..542e08d05e 100644
--- a/src/soc/ucb/riscv/cbmem.c
+++ b/src/soc/ucb/riscv/cbmem.c
@@ -12,16 +12,10 @@
  */
 
 #include <cbmem.h>
+#include <symbols.h>
+#include <ramdetect.h>
 
 void *cbmem_top(void)
 {
-	uintptr_t base;
-	size_t size;
-
-	/* Use dummy values until we can query the memory size again */
-	//query_mem(configstring(), &base, &size);
-	base = 0x80000000;
-	size = 128 * MiB;
-
-	return (void *)(base + size);
+	return _dram + (probe_ramsize((uintptr_t)_dram, CONFIG_DRAM_SIZE_MB) * MiB);
 }
-- 
cgit v1.2.3