From 4cd93b3b7ff458a53634d71f36d0039b5d3c5520 Mon Sep 17 00:00:00 2001
From: Martin Roth <martinroth@google.com>
Date: Tue, 26 Sep 2017 15:47:09 -0600
Subject: [PATCH] mb/amd/gardenia: Remove direct AGESA header includes

All AGESA headers should be included only through agesawrapper.h

BUG=b:66818758
TEST=Build gardenia

Change-Id: I3c9ae7a435fadabf577f1f65ad4a6aa6234e9a29
Signed-off-by: Martin Roth <martinroth@google.com>
Reviewed-on: https://review.coreboot.org/21717
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Aaron Durbin <adurbin@chromium.org>
---
 src/mainboard/amd/gardenia/BiosCallOuts.c           | 3 +--
 src/mainboard/amd/gardenia/OemCustomize.c           | 2 --
 src/mainboard/amd/gardenia/bootblock/BiosCallOuts.c | 3 +--
 src/mainboard/amd/gardenia/bootblock/OemCustomize.c | 2 --
 4 files changed, 2 insertions(+), 8 deletions(-)

diff --git a/src/mainboard/amd/gardenia/BiosCallOuts.c b/src/mainboard/amd/gardenia/BiosCallOuts.c
index e1e5437da7..398fadbf09 100644
--- a/src/mainboard/amd/gardenia/BiosCallOuts.c
+++ b/src/mainboard/amd/gardenia/BiosCallOuts.c
@@ -13,9 +13,8 @@
  * GNU General Public License for more details.
  */
 
-#include <AGESA.h>
+#include <agesawrapper.h>
 #include <BiosCallOuts.h>
-#include <FchPlatform.h>
 #include <soc/imc.h>
 #include <soc/southbridge.h>
 #include <stdlib.h>
diff --git a/src/mainboard/amd/gardenia/OemCustomize.c b/src/mainboard/amd/gardenia/OemCustomize.c
index 8bd8e7c041..1cee585b1d 100644
--- a/src/mainboard/amd/gardenia/OemCustomize.c
+++ b/src/mainboard/amd/gardenia/OemCustomize.c
@@ -13,9 +13,7 @@
  * GNU General Public License for more details.
  */
 
-#include <AGESA.h>
 #include <agesawrapper.h>
-#include <PlatformMemoryConfiguration.h>
 
 #define FILECODE PROC_GNB_PCIE_FAMILY_0X15_F15PCIECOMPLEXCONFIG_FILECODE
 
diff --git a/src/mainboard/amd/gardenia/bootblock/BiosCallOuts.c b/src/mainboard/amd/gardenia/bootblock/BiosCallOuts.c
index 8ab4240c16..6b52162ee6 100644
--- a/src/mainboard/amd/gardenia/bootblock/BiosCallOuts.c
+++ b/src/mainboard/amd/gardenia/bootblock/BiosCallOuts.c
@@ -13,9 +13,8 @@
  * GNU General Public License for more details.
  */
 
-#include <AGESA.h>
+#include <agesawrapper.h>
 #include <BiosCallOuts.h>
-#include <FchPlatform.h>
 #include <soc/southbridge.h>
 #include <stdlib.h>
 
diff --git a/src/mainboard/amd/gardenia/bootblock/OemCustomize.c b/src/mainboard/amd/gardenia/bootblock/OemCustomize.c
index 53b4a6ca04..82b77f288b 100644
--- a/src/mainboard/amd/gardenia/bootblock/OemCustomize.c
+++ b/src/mainboard/amd/gardenia/bootblock/OemCustomize.c
@@ -13,9 +13,7 @@
  * GNU General Public License for more details.
  */
 
-#include <AGESA.h>
 #include <agesawrapper.h>
-#include <PlatformMemoryConfiguration.h>
 
 #define FILECODE PROC_GNB_PCIE_FAMILY_0X15_F15PCIECOMPLEXCONFIG_FILECODE