<p>Marshall Dawson has uploaded this change for <strong>review</strong>.</p><p><a href="https://review.coreboot.org/27254">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">amd/common/pi: Remove obsolete heapmanager workaround<br><br>Remove residual code that allowed successful building of the heapmanager<br>code.  Now that stoneyridge no longer makes AGESA calls in bootblock, it<br>is safe to elimate the workaround.<br><br>BUG=b:74518368<br>TEST=boot Grunt<br><br>Change-Id: Ie169a691a177bcd8283c31c8188ce28bcbce82af<br>Signed-off-by: Marshall Dawson <marshalldawson3rd@gmail.com><br>---<br>M src/soc/amd/common/block/pi/heapmanager.c<br>1 file changed, 2 insertions(+), 10 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://review.coreboot.org:29418/coreboot refs/changes/54/27254/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/soc/amd/common/block/pi/heapmanager.c b/src/soc/amd/common/block/pi/heapmanager.c</span><br><span>index 63db1ce..cbffb77 100644</span><br><span>--- a/src/soc/amd/common/block/pi/heapmanager.c</span><br><span>+++ b/src/soc/amd/common/block/pi/heapmanager.c</span><br><span>@@ -73,17 +73,9 @@</span><br><span>     AGESA_REBASE_PARAMS *Rebase;</span><br><span> </span><br><span>     Rebase = (AGESA_REBASE_PARAMS *)ConfigPtr;</span><br><span style="color: hsl(0, 100%, 40%);">-      if (ENV_BOOTBLOCK) {</span><br><span style="color: hsl(120, 100%, 40%);">+  Rebase->HeapAddress = (UINTN)agesa_heap_base();</span><br><span style="color: hsl(120, 100%, 40%);">+    if (!Rebase->HeapAddress)</span><br><span>                 Rebase->HeapAddress = CONFIG_PI_AGESA_CAR_HEAP_BASE;</span><br><span style="color: hsl(0, 100%, 40%);">- } else {</span><br><span style="color: hsl(0, 100%, 40%);">-                /*</span><br><span style="color: hsl(0, 100%, 40%);">-               * todo: remove the if() above and keep the assignment here</span><br><span style="color: hsl(0, 100%, 40%);">-              * once all AGESA functions are removed from bootblock.</span><br><span style="color: hsl(0, 100%, 40%);">-          */</span><br><span style="color: hsl(0, 100%, 40%);">-             Rebase->HeapAddress = (UINTN)agesa_heap_base();</span><br><span style="color: hsl(0, 100%, 40%);">-              if (!Rebase->HeapAddress)</span><br><span style="color: hsl(0, 100%, 40%);">-                    Rebase->HeapAddress = CONFIG_PI_AGESA_CAR_HEAP_BASE;</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span> </span><br><span>        return AGESA_SUCCESS;</span><br><span> }</span><br><span></span><br></pre><p>To view, visit <a href="https://review.coreboot.org/27254">change 27254</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/27254"/><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: Ie169a691a177bcd8283c31c8188ce28bcbce82af </div>
<div style="display:none"> Gerrit-Change-Number: 27254 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Marshall Dawson <marshalldawson3rd@gmail.com> </div>