<p>Martin Roth has uploaded this change for <strong>review</strong>.</p><p><a href="https://review.coreboot.org/21715">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">soc/amd/common: Remove direct AGESA header includes<br><br>All AGESA headers should be included only through agesawrapper.h<br><br>Change-Id: I94140235f46a627dda99540af8619aeca3f4f157<br>Signed-off-by: Martin Roth <martinroth@google.com><br>---<br>M src/soc/amd/common/BiosCallOuts.h<br>M src/soc/amd/common/agesawrapper.c<br>M src/soc/amd/common/agesawrapper_call.h<br>M src/soc/amd/common/block/include/amdblocks/psp.h<br>M src/soc/amd/common/def_callouts.c<br>M src/soc/amd/common/heapmanager.c<br>6 files changed, 5 insertions(+), 13 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://review.coreboot.org:29418/coreboot refs/changes/15/21715/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..4de1683 100644<br>--- a/src/soc/amd/common/BiosCallOuts.h<br>+++ b/src/soc/amd/common/BiosCallOuts.h<br>@@ -17,8 +17,7 @@<br> #ifndef __CALLOUTS_AMD_AGESA_H__<br> #define __CALLOUTS_AMD_AGESA_H__<br> <br>-#include <Porting.h><br>-#include <AGESA.h><br>+#include <agesawrapper.h><br> <br> #define BIOS_HEAP_START_ADDRESS 0x010000000<br> #define BIOS_HEAP_SIZE 0x30000<br>diff --git a/src/soc/amd/common/agesawrapper.c b/src/soc/amd/common/agesawrapper.c<br>index b95d61a..f493971 100644<br>--- a/src/soc/amd/common/agesawrapper.c<br>+++ b/src/soc/amd/common/agesawrapper.c<br>@@ -13,13 +13,10 @@<br> * GNU General Public License for more details.<br> */<br> <br>-#include <AGESA.h><br> #include <cbfs.h><br> #include <cbmem.h><br> #include <delay.h><br> #include <cpu/x86/mtrr.h><br>-#include <FchPlatform.h><br>-#include <heapManager.h><br> #include <agesawrapper.h><br> #include <BiosCallOuts.h><br> <br>diff --git a/src/soc/amd/common/agesawrapper_call.h b/src/soc/amd/common/agesawrapper_call.h<br>index 21a1e23..d5b5a2c 100644<br>--- a/src/soc/amd/common/agesawrapper_call.h<br>+++ b/src/soc/amd/common/agesawrapper_call.h<br>@@ -16,7 +16,7 @@<br> <br> #include <stdint.h><br> #include <console/console.h><br>-#include <AGESA.h><br>+#include <agesawrapper.h><br> <br> /*<br> * Possible AGESA_STATUS values:<br>diff --git a/src/soc/amd/common/block/include/amdblocks/psp.h b/src/soc/amd/common/block/include/amdblocks/psp.h<br>index 42b9fb7..63e64f8 100644<br>--- a/src/soc/amd/common/block/include/amdblocks/psp.h<br>+++ b/src/soc/amd/common/block/include/amdblocks/psp.h<br>@@ -18,8 +18,7 @@<br> <br> #include <stdint.h><br> #include <compiler.h><br>-#include <Porting.h><br>-#include <Proc/Psp/PspBaseLib/PspBaseLib.h><br>+#include <agesawrapper.h><br> <br> /* x86 to PSP commands */<br> #define MBOX_BIOS_CMD_DRAM_INFO 0x01<br>diff --git a/src/soc/amd/common/def_callouts.c b/src/soc/amd/common/def_callouts.c<br>index fda0013..428d9dd 100644<br>--- a/src/soc/amd/common/def_callouts.c<br>+++ b/src/soc/amd/common/def_callouts.c<br>@@ -17,9 +17,6 @@<br> #include <cbfs.h><br> #include <spd_bin.h><br> <br>-#include <AGESA.h><br>-#include <amdlib.h><br>-#include <Ids.h><br> #include <agesawrapper.h><br> #include <BiosCallOuts.h><br> #include <dimmSpd.h><br>diff --git a/src/soc/amd/common/heapmanager.c b/src/soc/amd/common/heapmanager.c<br>index 6c240eb..2a52f6d 100644<br>--- a/src/soc/amd/common/heapmanager.c<br>+++ b/src/soc/amd/common/heapmanager.c<br>@@ -12,12 +12,11 @@<br> */<br> <br> <br>-#include <AGESA.h><br>+#include <agesawrapper.h><br> #include <amdlib.h><br> #include <arch/acpi.h><br> #include <BiosCallOuts.h><br> #include <cbmem.h><br>-#include <heapManager.h><br> #include <string.h><br> <br> UINT32 GetHeapBase(AMD_CONFIG_PARAMS *StdHeader)<br>@@ -38,6 +37,7 @@<br> <br> AGESA_STATUS agesa_AllocateBuffer (UINT32 Func, UINTN Data, VOID *ConfigPtr)<br> {<br>+<br> UINT32 AvailableHeapSize;<br> UINT8 *BiosHeapBaseAddr;<br> UINT32 CurrNodeOffset;<br></pre><p>To view, visit <a href="https://review.coreboot.org/21715">change 21715</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/21715"/><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: I94140235f46a627dda99540af8619aeca3f4f157 </div>
<div style="display:none"> Gerrit-Change-Number: 21715 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Martin Roth <martinroth@google.com> </div>