<p>Philipp Hug has uploaded this change for <strong>review</strong>.</p><p><a href="https://review.coreboot.org/29197">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">sifive/fu540: correct cbmem support<br><br>Return correct memory location for cbmem instead of incorrectly returning memory size.<br><br>Change-Id: If7f490a46edebb04c2280bf317d1adacef08f30d<br>Signed-off-by: Philipp Hug <philipp@hug.cx><br>---<br>M src/soc/sifive/fu540/cbmem.c<br>M src/soc/sifive/fu540/include/soc/addressmap.h<br>2 files changed, 7 insertions(+), 2 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://review.coreboot.org:29418/coreboot refs/changes/97/29197/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/soc/sifive/fu540/cbmem.c b/src/soc/sifive/fu540/cbmem.c</span><br><span>index 8648370..61bff89 100644</span><br><span>--- a/src/soc/sifive/fu540/cbmem.c</span><br><span>+++ b/src/soc/sifive/fu540/cbmem.c</span><br><span>@@ -14,9 +14,13 @@</span><br><span>  */</span><br><span> </span><br><span> #include <cbmem.h></span><br><span style="color: hsl(120, 100%, 40%);">+#include <soc/addressmap.h></span><br><span style="color: hsl(120, 100%, 40%);">+#include <soc/sdram.h></span><br><span style="color: hsl(120, 100%, 40%);">+#include <stdlib.h></span><br><span style="color: hsl(120, 100%, 40%);">+#include <symbols.h></span><br><span> </span><br><span> void *cbmem_top(void)</span><br><span> {</span><br><span style="color: hsl(0, 100%, 40%);">- /* dummy value */</span><br><span style="color: hsl(0, 100%, 40%);">-       return (void *)(4ULL * GiB);</span><br><span style="color: hsl(120, 100%, 40%);">+  return (void *)min((uintptr_t)_dram + sdram_size_mb() * MiB,</span><br><span style="color: hsl(120, 100%, 40%);">+                     FU540_MAXDRAM);</span><br><span> }</span><br><span>diff --git a/src/soc/sifive/fu540/include/soc/addressmap.h b/src/soc/sifive/fu540/include/soc/addressmap.h</span><br><span>index 21709b5..7493630 100644</span><br><span>--- a/src/soc/sifive/fu540/include/soc/addressmap.h</span><br><span>+++ b/src/soc/sifive/fu540/include/soc/addressmap.h</span><br><span>@@ -34,3 +34,4 @@</span><br><span> #define FU540_QSPI0FLASH        0x20000000</span><br><span> #define FU540_QSPI1FLASH  0x30000000</span><br><span> #define FU540_DRAM                0x80000000</span><br><span style="color: hsl(120, 100%, 40%);">+#define FU540_MAXDRAM               0x2000000000</span><br><span></span><br></pre><p>To view, visit <a href="https://review.coreboot.org/29197">change 29197</a>. To unsubscribe, or for help writing mail filters, visit <a href="https://review.coreboot.org/settings">settings</a>.</p><div itemscope itemtype="http://schema.org/EmailMessage"><div itemscope itemprop="action" itemtype="http://schema.org/ViewAction"><link itemprop="url" href="https://review.coreboot.org/29197"/><meta itemprop="name" content="View Change"/></div></div>

<div style="display:none"> Gerrit-Project: coreboot </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>
<div style="display:none"> Gerrit-Change-Id: If7f490a46edebb04c2280bf317d1adacef08f30d </div>
<div style="display:none"> Gerrit-Change-Number: 29197 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Philipp Hug <philipp@hug.cx> </div>