Change in coreboot[master]: soc/amd/common: Remove direct AGESA header includes

[Martin Roth (Code Review)]

Martin Roth has uploaded this change for review. ( https://review.coreboot.org/21715

Change subject: soc/amd/common: Remove direct AGESA header includes
......................................................................

soc/amd/common: Remove direct AGESA header includes

All AGESA headers should be included only through agesawrapper.h

Change-Id: I94140235f46a627dda99540af8619aeca3f4f157
Signed-off-by: Martin Roth 
---
M src/soc/amd/common/BiosCallOuts.h
M src/soc/amd/common/agesawrapper.c
M src/soc/amd/common/agesawrapper_call.h
M src/soc/amd/common/block/include/amdblocks/psp.h
M src/soc/amd/common/def_callouts.c
M src/soc/amd/common/heapmanager.c
6 files changed, 5 insertions(+), 13 deletions(-)

git pull ssh://review.coreboot.org:29418/coreboot refs/changes/15/21715/1

diff --git a/src/soc/amd/common/BiosCallOuts.h b/src/soc/amd/common/BiosCallOuts.h
index 4456466..4de1683 100644
--- a/src/soc/amd/common/BiosCallOuts.h
+++ b/src/soc/amd/common/BiosCallOuts.h
@@ -17,8 +17,7 @@
 #ifndef __CALLOUTS_AMD_AGESA_H__
 #define __CALLOUTS_AMD_AGESA_H__

-#include <Porting.h>
-#include <AGESA.h>
+#include <agesawrapper.h>

#define BIOS_HEAP_START_ADDRESS		0x010000000
 #define BIOS_HEAP_SIZE			0x30000
diff --git a/src/soc/amd/common/agesawrapper.c b/src/soc/amd/common/agesawrapper.c
index b95d61a..f493971 100644
--- a/src/soc/amd/common/agesawrapper.c
+++ b/src/soc/amd/common/agesawrapper.c
@@ -13,13 +13,10 @@
  * GNU General Public License for more details.
  */

-#include <AGESA.h>
 #include <cbfs.h>
 #include <cbmem.h>
 #include <delay.h>
 #include <cpu/x86/mtrr.h>
-#include <FchPlatform.h>
-#include <heapManager.h>
 #include <agesawrapper.h>
 #include <BiosCallOuts.h>

diff --git a/src/soc/amd/common/agesawrapper_call.h b/src/soc/amd/common/agesawrapper_call.h
index 21a1e23..d5b5a2c 100644
--- a/src/soc/amd/common/agesawrapper_call.h
+++ b/src/soc/amd/common/agesawrapper_call.h
@@ -16,7 +16,7 @@

#include <stdint.h>
 #include <console/console.h>
-#include <AGESA.h>
+#include <agesawrapper.h>

/*
  * Possible AGESA_STATUS values:
diff --git a/src/soc/amd/common/block/include/amdblocks/psp.h b/src/soc/amd/common/block/include/amdblocks/psp.h
index 42b9fb7..63e64f8 100644
--- a/src/soc/amd/common/block/include/amdblocks/psp.h
+++ b/src/soc/amd/common/block/include/amdblocks/psp.h
@@ -18,8 +18,7 @@

#include <stdint.h>
 #include <compiler.h>
-#include <Porting.h>
-#include <Proc/Psp/PspBaseLib/PspBaseLib.h>
+#include <agesawrapper.h>

/* x86 to PSP commands */
 #define MBOX_BIOS_CMD_DRAM_INFO    0x01
diff --git a/src/soc/amd/common/def_callouts.c b/src/soc/amd/common/def_callouts.c
index fda0013..428d9dd 100644
--- a/src/soc/amd/common/def_callouts.c
+++ b/src/soc/amd/common/def_callouts.c
@@ -17,9 +17,6 @@
 #include <cbfs.h>
 #include <spd_bin.h>

-#include <AGESA.h>
-#include <amdlib.h>
-#include <Ids.h>
 #include <agesawrapper.h>
 #include <BiosCallOuts.h>
 #include <dimmSpd.h>
diff --git a/src/soc/amd/common/heapmanager.c b/src/soc/amd/common/heapmanager.c
index 6c240eb..2a52f6d 100644
--- a/src/soc/amd/common/heapmanager.c
+++ b/src/soc/amd/common/heapmanager.c
@@ -12,12 +12,11 @@
  */

-#include <AGESA.h>
+#include <agesawrapper.h>
 #include <amdlib.h>
 #include <arch/acpi.h>
 #include <BiosCallOuts.h>
 #include <cbmem.h>
-#include <heapManager.h>
 #include <string.h>

UINT32 GetHeapBase(AMD_CONFIG_PARAMS *StdHeader)
@@ -38,6 +37,7 @@

AGESA_STATUS agesa_AllocateBuffer (UINT32 Func, UINTN Data, VOID *ConfigPtr)
 {
+
    UINT32              AvailableHeapSize;
    UINT8               *BiosHeapBaseAddr;
    UINT32              CurrNodeOffset;