<p>Marshall Dawson has uploaded this change for <strong>review</strong>.</p><p><a href="https://review.coreboot.org/21593">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">soc/amd/common: Convert GetHeapBase to void pointer<br><br>Change the type of value returned by GetHeapBase().  This should be<br>innocuous, and will allow a subsequent patch to be simpler.<br><br>Change-Id: Id4a024d000a514ea9a44f9dfc2caffae9ff01789<br>Signed-off-by: Marshall Dawson <marshalldawson3rd@gmail.com><br>---<br>M src/soc/amd/common/BiosCallOuts.h<br>M src/soc/amd/common/heapmanager.c<br>2 files changed, 8 insertions(+), 8 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://review.coreboot.org:29418/coreboot refs/changes/93/21593/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">diff --git a/src/soc/amd/common/BiosCallOuts.h b/src/soc/amd/common/BiosCallOuts.h<br>index 4456466..00ce745 100644<br>--- a/src/soc/amd/common/BiosCallOuts.h<br>+++ b/src/soc/amd/common/BiosCallOuts.h<br>@@ -35,7 +35,7 @@<br>      UINT32 NextNodeOffset;<br> } BIOS_BUFFER_NODE;<br> <br>-UINT32 GetHeapBase(AMD_CONFIG_PARAMS *StdHeader);<br>+void *GetHeapBase(AMD_CONFIG_PARAMS *StdHeader);<br> void EmptyHeap(void);<br> <br> AGESA_STATUS agesa_AllocateBuffer(UINT32 Func, UINTN Data, VOID *ConfigPtr);<br>diff --git a/src/soc/amd/common/heapmanager.c b/src/soc/amd/common/heapmanager.c<br>index 6c240eb..902fb15 100644<br>--- a/src/soc/amd/common/heapmanager.c<br>+++ b/src/soc/amd/common/heapmanager.c<br>@@ -20,19 +20,19 @@<br> #include <heapManager.h><br> #include <string.h><br> <br>-UINT32 GetHeapBase(AMD_CONFIG_PARAMS *StdHeader)<br>+void *GetHeapBase(AMD_CONFIG_PARAMS *StdHeader)<br> {<br>-      UINT32 heap = BIOS_HEAP_START_ADDRESS;<br>+       void *heap = (void *)BIOS_HEAP_START_ADDRESS;<br> <br>      if (acpi_is_wakeup_s3())<br>-             heap = (UINT32)cbmem_find(CBMEM_ID_RESUME_SCRATCH);<br>+          heap = cbmem_find(CBMEM_ID_RESUME_SCRATCH);<br> <br>        return heap;<br> }<br> <br> void EmptyHeap(void)<br> {<br>-       void *BiosManagerPtr = (void *)GetHeapBase(NULL);<br>+    void *BiosManagerPtr = GetHeapBase(NULL);<br>     memset(BiosManagerPtr, 0, BIOS_HEAP_SIZE);<br> }<br> <br>@@ -58,7 +58,7 @@<br>  AllocParams->BufferPointer = NULL;<br> <br>      AvailableHeapSize = BIOS_HEAP_SIZE - sizeof(BIOS_HEAP_MANAGER);<br>-      BiosHeapBaseAddr = (UINT8 *)GetHeapBase(&(AllocParams->StdHeader));<br>+   BiosHeapBaseAddr = GetHeapBase(&(AllocParams->StdHeader));<br>     BiosHeapBasePtr = (BIOS_HEAP_MANAGER *)BiosHeapBaseAddr;<br> <br>   if (BiosHeapBasePtr->StartOfAllocatedNodes == 0) {<br>@@ -215,7 +215,7 @@<br> <br>         AllocParams = (AGESA_BUFFER_PARAMS *)ConfigPtr;<br> <br>-   BiosHeapBaseAddr = (UINT8 *)GetHeapBase(&(AllocParams->StdHeader));<br>+   BiosHeapBaseAddr = GetHeapBase(&(AllocParams->StdHeader));<br>     BiosHeapBasePtr = (BIOS_HEAP_MANAGER *)BiosHeapBaseAddr;<br> <br>   /* Find target node to deallocate in list of allocated nodes.<br>@@ -338,7 +338,7 @@<br> <br>         AllocParams = (AGESA_BUFFER_PARAMS *)ConfigPtr;<br> <br>-   BiosHeapBaseAddr = (UINT8 *)GetHeapBase(&(AllocParams->StdHeader));<br>+   BiosHeapBaseAddr = GetHeapBase(&(AllocParams->StdHeader));<br>     BiosHeapBasePtr = (BIOS_HEAP_MANAGER *)BiosHeapBaseAddr;<br> <br>   AllocNodeOffset = BiosHeapBasePtr->StartOfAllocatedNodes;<br></pre><p>To view, visit <a href="https://review.coreboot.org/21593">change 21593</a>. To unsubscribe, 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/21593"/><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: Id4a024d000a514ea9a44f9dfc2caffae9ff01789 </div>
<div style="display:none"> Gerrit-Change-Number: 21593 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Marshall Dawson <marshalldawson3rd@gmail.com> </div>