[coreboot-gerrit] Patch set updated for coreboot: 4cd6411 ipq806x: Fix casting in cbmem_top() so >=2GB can be used

Marc Jones (marc.jones@se-eng.com) gerrit at coreboot.org
Sun Jan 4 00:16:58 CET 2015


Marc Jones (marc.jones at se-eng.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/8059

-gerrit

commit 4cd6411c13f8f17362dd1c379fae17954478c0ae
Author: David Hendricks <dhendrix at chromium.org>
Date:   Fri Jun 27 13:25:02 2014 -0700

    ipq806x: Fix casting in cbmem_top() so >=2GB can be used
    
    This explicitly casts CONFIG_SYS_SDRAM_BASE to an unsigned type so
    we don't get compilation errors when increasing CONFIG_DRAM_SIZE_MB.
    
    BUG=chrome-os-partner:29871
    BRANCH=storm
    TEST=compilation no longer fails with DRAM_SIZE set to 1024
    
    Original-Signed-off-by: David Hendricks <dhendrix at chromium.org>
    Original-Change-Id: I9717c39d87682d43ec4e7a4042d9b559a1d7eedb
    Original-Reviewed-on: https://chromium-review.googlesource.com/206010
    Original-Reviewed-by: Stefan Reinauer <reinauer at chromium.org>
    (cherry picked from commit 178db896346ae8cbc5ddec5373a83688f32c62ba)
    Signed-off-by: Marc Jones <marc.jones at se-eng.com>
    
    Change-Id: I68c11d398820684ad928bdfdd74f7a6885247333
---
 src/soc/qualcomm/ipq806x/cbmem.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/soc/qualcomm/ipq806x/cbmem.c b/src/soc/qualcomm/ipq806x/cbmem.c
index b175d6a..ecb02e4 100644
--- a/src/soc/qualcomm/ipq806x/cbmem.c
+++ b/src/soc/qualcomm/ipq806x/cbmem.c
@@ -18,8 +18,10 @@
  */
 
 #include <cbmem.h>
+#include <stddef.h>
 
 void *cbmem_top(void)
 {
-	return (void *)(CONFIG_SYS_SDRAM_BASE + (CONFIG_DRAM_SIZE_MB << 20));
+	return (void *)((uintptr_t)CONFIG_SYS_SDRAM_BASE +
+					(CONFIG_DRAM_SIZE_MB << 20));
 }



More information about the coreboot-gerrit mailing list