From 78b05dfbb26320f4c875e7cd5bcbeb95b2b9d64a Mon Sep 17 00:00:00 2001
From: Martin Roth <martinroth@google.com>
Date: Sat, 11 Nov 2017 19:14:31 -0700
Subject: [PATCH] soc/amd/stoneyridge: 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: Iadc516e11148048ed9bf43c7a46827793245027a
Signed-off-by: Martin Roth <martinroth@google.com>
Reviewed-on: https://review.coreboot.org/21716
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Aaron Durbin <adurbin@chromium.org>
---
 src/soc/amd/stoneyridge/BiosCallOuts.c  | 1 -
 src/soc/amd/stoneyridge/dimmSpd.c       | 5 +----
 src/soc/amd/stoneyridge/early_setup.c   | 6 +-----
 src/soc/amd/stoneyridge/imc.c           | 6 +-----
 src/soc/amd/stoneyridge/include/fchec.h | 5 +----
 src/soc/amd/stoneyridge/smbus_spd.c     | 5 +----
 6 files changed, 5 insertions(+), 23 deletions(-)

diff --git a/src/soc/amd/stoneyridge/BiosCallOuts.c b/src/soc/amd/stoneyridge/BiosCallOuts.c
index 0686880ca2..9110338aba 100644
--- a/src/soc/amd/stoneyridge/BiosCallOuts.c
+++ b/src/soc/amd/stoneyridge/BiosCallOuts.c
@@ -20,7 +20,6 @@
 #include <soc/southbridge.h>
 
 #include <agesawrapper.h>
-#include <AGESA.h>
 #include <amdlib.h>
 #include <dimmSpd.h>
 
diff --git a/src/soc/amd/stoneyridge/dimmSpd.c b/src/soc/amd/stoneyridge/dimmSpd.c
index f4507d65f8..163779d95f 100644
--- a/src/soc/amd/stoneyridge/dimmSpd.c
+++ b/src/soc/amd/stoneyridge/dimmSpd.c
@@ -13,14 +13,11 @@
  * GNU General Public License for more details.
  */
 
+#include <agesawrapper.h>
 #include <device/pci_def.h>
 #include <device/device.h>
 #include <soc/pci_devs.h>
 #include <stdlib.h>
-
-/* warning: Porting.h includes an open #pragma pack(1) */
-#include <Porting.h>
-#include <AGESA.h>
 #include "chip.h"
 #include <dimmSpd.h>
 
diff --git a/src/soc/amd/stoneyridge/early_setup.c b/src/soc/amd/stoneyridge/early_setup.c
index ecae7ab62e..ec3baa4d8b 100644
--- a/src/soc/amd/stoneyridge/early_setup.c
+++ b/src/soc/amd/stoneyridge/early_setup.c
@@ -13,6 +13,7 @@
  * GNU General Public License for more details.
  */
 
+#include <agesawrapper.h>
 #include <assert.h>
 #include <stdint.h>
 #include <arch/io.h>
@@ -26,11 +27,6 @@
 #include <cpu/x86/msr.h>
 #include <delay.h>
 
-/* vendor includes */
-#include <Porting.h>
-#include <AGESA.h>
-#include <Fch/Fch.h>
-
 void configure_stoneyridge_uart(void)
 {
 	u8 byte, byte2;
diff --git a/src/soc/amd/stoneyridge/imc.c b/src/soc/amd/stoneyridge/imc.c
index a42a9e0291..4c505df522 100644
--- a/src/soc/amd/stoneyridge/imc.c
+++ b/src/soc/amd/stoneyridge/imc.c
@@ -15,15 +15,11 @@
 
 #define __SIMPLE_DEVICE__
 
+#include <agesawrapper.h>
 #include <soc/imc.h>
 #include <arch/io.h>
 #include <device/device.h>
 #include <delay.h>
-#include <Porting.h>
-#include <AGESA.h>
-#include <Proc/Fch/Common/FchCommonCfg.h>
-#include <Proc/Fch/Fch.h>
-#include <Proc/Fch/FchPlatform.h>
 
 #define VACPI_MMIO_VBASE ((u8 *)ACPI_MMIO_BASE)
 
diff --git a/src/soc/amd/stoneyridge/include/fchec.h b/src/soc/amd/stoneyridge/include/fchec.h
index acbc1386a9..e5e9cfd888 100644
--- a/src/soc/amd/stoneyridge/include/fchec.h
+++ b/src/soc/amd/stoneyridge/include/fchec.h
@@ -16,12 +16,9 @@
 #ifndef __AMD_STONEY_FCHEC__
 #define __AMD_STONEY_FCHEC__
 
+#include <agesawrapper.h>
 #include <soc/imc.h>
-#include "Porting.h"
-#include "AGESA.h"
-#include "FchCommonCfg.h"
 
-extern VOID FchECfancontrolservice (IN VOID *FchDataPtr);
 void agesawrapper_fchecfancontrolservice(void);
 
 #endif
diff --git a/src/soc/amd/stoneyridge/smbus_spd.c b/src/soc/amd/stoneyridge/smbus_spd.c
index 0b0876074f..f5c77c9baa 100644
--- a/src/soc/amd/stoneyridge/smbus_spd.c
+++ b/src/soc/amd/stoneyridge/smbus_spd.c
@@ -13,12 +13,9 @@
  * GNU General Public License for more details.
  */
 
+#include <agesawrapper.h>
 #include <device/pci_def.h>
 #include <device/device.h>
-
-/* warning: Porting.h includes an open #pragma pack(1) */
-#include <Porting.h>
-#include <AGESA.h>
 #include <soc/southbridge.h>
 #include <soc/smbus.h>
 #include <dimmSpd.h>