[coreboot-gerrit] Patch set updated for coreboot: mediatek/mt8173: revise cbmem_top

[Patrick Georgi (pgeorgi@google.com)]

Patrick Georgi (pgeorgi at google.com) just uploaded a new patch set to gerrit, which you can find at https://review.coreboot.org/13098

-gerrit

commit fb922e3c8b2001f9388852111379f4bf2faf4c27
Author: CC Ma <cc.ma at mediatek.com>
Date:   Thu Aug 6 14:07:50 2015 +0800

    mediatek/mt8173: revise cbmem_top
    
    Support memory range querying to above/below 4GiB.
    Enable PRERAM_CBMEM_CONSOLE.
    
    BRANCH=none
    BUG=none
    TEST=build and verified pass on oak board
    
    Change-Id: If12ab2e9b8a129e2c82dd97b0493d9abdd6985a9
    Signed-off-by: Patrick Georgi <pgeorgi at chromium.org>
    Original-Commit-Id: 139a3163ca867ec5676c6cb81fdec724c99a4a99
    Original-Change-Id: Ie190f86f49ae88671f0738e2d6ceafdad58a93cc
    Original-Signed-off-by: CC Ma <cc.ma at mediatek.com>
    Original-Reviewed-on: https://chromium-review.googlesource.com/292559
    Original-Commit-Ready: Yidi Lin <yidi.lin at mediatek.com>
    Original-Tested-by: Yidi Lin <yidi.lin at mediatek.com>
    Original-Reviewed-by: Julius Werner <jwerner at chromium.org>
---
 src/soc/mediatek/mt8173/cbmem.c | 4 +++-
 src/soc/mediatek/mt8173/soc.c   | 3 +--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/soc/mediatek/mt8173/cbmem.c b/src/soc/mediatek/mt8173/cbmem.c
index ae96c29..c7afd6c 100644
--- a/src/soc/mediatek/mt8173/cbmem.c
+++ b/src/soc/mediatek/mt8173/cbmem.c
@@ -15,9 +15,11 @@
 
 #include <cbmem.h>
 #include <stddef.h>
+#include <stdlib.h>
 #include <symbols.h>
 
 void *cbmem_top(void)
 {
-	return (void *)((uintptr_t) _dram + (CONFIG_DRAM_SIZE_MB << 20));
+	return (void *)min((uintptr_t)_dram + ((size_t)CONFIG_DRAM_SIZE_MB * MiB),
+			   (uintptr_t)4 * GiB);
 }
diff --git a/src/soc/mediatek/mt8173/soc.c b/src/soc/mediatek/mt8173/soc.c
index 9183be12..7f0b1b7 100644
--- a/src/soc/mediatek/mt8173/soc.c
+++ b/src/soc/mediatek/mt8173/soc.c
@@ -16,13 +16,12 @@
 #include <cpu/cpu.h>
 #include <console/console.h>
 #include <device/device.h>
-
 #include <symbols.h>
 
 static void soc_read_resources(device_t dev)
 {
 	ram_resource(dev, 0, (uintptr_t)_dram / KiB,
-		     CONFIG_DRAM_SIZE_MB * KiB);
+		     CONFIG_DRAM_SIZE_MB * (MiB / KiB));
 }
 
 static void soc_init(device_t dev)