summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorMartin Roth <martinroth@google.com>2017-11-11 19:03:39 -0700
committerMartin Roth <martinroth@google.com>2017-11-14 21:00:02 +0000
commitb2c0d08a4e34b30a9419ddee1b526b006fded6d7 (patch)
tree1634b62265b401fd5d555df5fa52002d83e09402 /src
parentb564eae5e1decb5512fe9229aa35c74b9dd3ee38 (diff)
soc/amd/common: Remove direct AGESA header includes
All AGESA headers should be included only through agesawrapper.h BUG=b:66818758 TEST=Build gardenia; Build & boot kahlee Change-Id: I94140235f46a627dda99540af8619aeca3f4f157 Signed-off-by: Martin Roth <martinroth@google.com> Reviewed-on: https://review.coreboot.org/21715 Tested-by: build bot (Jenkins) <no-reply@coreboot.org> Reviewed-by: Aaron Durbin <adurbin@chromium.org>
Diffstat (limited to 'src')
-rw-r--r--src/soc/amd/common/BiosCallOuts.h4
-rw-r--r--src/soc/amd/common/agesawrapper.c5
-rw-r--r--src/soc/amd/common/agesawrapper_call.h2
-rw-r--r--src/soc/amd/common/block/include/amdblocks/psp.h3
-rw-r--r--src/soc/amd/common/def_callouts.c5
-rw-r--r--src/soc/amd/common/heapmanager.c3
6 files changed, 6 insertions, 16 deletions
diff --git a/src/soc/amd/common/BiosCallOuts.h b/src/soc/amd/common/BiosCallOuts.h
index a2c719f2f5..5237d52b6a 100644
--- a/src/soc/amd/common/BiosCallOuts.h
+++ b/src/soc/amd/common/BiosCallOuts.h
@@ -17,9 +17,7 @@
#ifndef __CALLOUTS_AMD_AGESA_H__
#define __CALLOUTS_AMD_AGESA_H__
-#include <Porting.h>
-#include <AGESA.h>
-#include <FchPlatform.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 17f2e76464..80887ab091 100644
--- a/src/soc/amd/common/agesawrapper.c
+++ b/src/soc/amd/common/agesawrapper.c
@@ -13,14 +13,11 @@
* GNU General Public License for more details.
*/
-#include <AGESA.h>
+#include "agesawrapper.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>
#include <string.h>
diff --git a/src/soc/amd/common/agesawrapper_call.h b/src/soc/amd/common/agesawrapper_call.h
index 21a1e23d54..01e2620961 100644
--- a/src/soc/amd/common/agesawrapper_call.h
+++ b/src/soc/amd/common/agesawrapper_call.h
@@ -14,9 +14,9 @@
#ifndef __AGESAWRAPPER_CALL_H__
#define __AGESAWRAPPER_CALL_H__
+#include "agesawrapper.h"
#include <stdint.h>
#include <console/console.h>
-#include <AGESA.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 74ea73f7f7..57ba64945b 100644
--- a/src/soc/amd/common/block/include/amdblocks/psp.h
+++ b/src/soc/amd/common/block/include/amdblocks/psp.h
@@ -16,11 +16,10 @@
#ifndef __AMD_PSP_H__
#define __AMD_PSP_H__
+#include <agesawrapper.h>
#include <soc/pci_devs.h>
#include <stdint.h>
#include <compiler.h>
-#include <Porting.h>
-#include <Proc/Psp/PspBaseLib/PspBaseLib.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 9cea9658fa..e8d404e465 100644
--- a/src/soc/amd/common/def_callouts.c
+++ b/src/soc/amd/common/def_callouts.c
@@ -15,12 +15,9 @@
*/
#include <cbfs.h>
-
-#include <AGESA.h>
#include <amdlib.h>
-#include <Ids.h>
-#include <agesawrapper.h>
#include <BiosCallOuts.h>
+#include "agesawrapper.h"
#include <soc/southbridge.h>
#if ENV_BOOTBLOCK
diff --git a/src/soc/amd/common/heapmanager.c b/src/soc/amd/common/heapmanager.c
index 5e4fbb4166..b99151487d 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>
static void *GetHeapBase(void)