From b564eae5e1decb5512fe9229aa35c74b9dd3ee38 Mon Sep 17 00:00:00 2001
From: Martin Roth <martinroth@google.com>
Date: Sat, 11 Nov 2017 18:14:48 -0700
Subject: [PATCH] mb/google/kahlee: Remove direct AGESA header includes

All Stoney AGESA headers should be included only through agesawrapper.h

BUG=b:66818758
TEST=Build and boot tested

Change-Id: I642f5caf8a37ae4042c32fec3a92e0995193cb7a
Signed-off-by: Martin Roth <martinroth@google.com>
Reviewed-on: https://review.coreboot.org/21714
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Aaron Durbin <adurbin@chromium.org>
---
 src/mainboard/google/kahlee/BiosCallOuts.c                     | 3 +--
 src/mainboard/google/kahlee/OemCustomize.c                     | 2 --
 src/mainboard/google/kahlee/variants/baseboard/gpio.c          | 3 +--
 .../kahlee/variants/baseboard/include/baseboard/variants.h     | 2 +-
 src/mainboard/google/kahlee/variants/kahlee/gpio.c             | 3 +--
 5 files changed, 4 insertions(+), 9 deletions(-)

diff --git a/src/mainboard/google/kahlee/BiosCallOuts.c b/src/mainboard/google/kahlee/BiosCallOuts.c
index 2f6a6036c8..fd8465a240 100644
--- a/src/mainboard/google/kahlee/BiosCallOuts.c
+++ b/src/mainboard/google/kahlee/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>
 #include <baseboard/variants.h>
diff --git a/src/mainboard/google/kahlee/OemCustomize.c b/src/mainboard/google/kahlee/OemCustomize.c
index bd58e0ecc8..c50752698a 100644
--- a/src/mainboard/google/kahlee/OemCustomize.c
+++ b/src/mainboard/google/kahlee/OemCustomize.c
@@ -14,9 +14,7 @@
  */
 
 #include <chip.h>
-#include <AGESA.h>
 #include <agesawrapper.h>
-#include <PlatformMemoryConfiguration.h>
 
 #define DIMMS_PER_CHANNEL 1
 #if DIMMS_PER_CHANNEL > MAX_DIMMS_PER_CH
diff --git a/src/mainboard/google/kahlee/variants/baseboard/gpio.c b/src/mainboard/google/kahlee/variants/baseboard/gpio.c
index aca96c4e50..4dc6d45368 100644
--- a/src/mainboard/google/kahlee/variants/baseboard/gpio.c
+++ b/src/mainboard/google/kahlee/variants/baseboard/gpio.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  */
 
-#include <AGESA.h>
-#include <FchPlatform.h>
+#include <agesawrapper.h>
 #include <baseboard/variants.h>
 #include <soc/smi.h>
 #include <soc/southbridge.h>
diff --git a/src/mainboard/google/kahlee/variants/baseboard/include/baseboard/variants.h b/src/mainboard/google/kahlee/variants/baseboard/include/baseboard/variants.h
index aad560708a..b4e0891063 100644
--- a/src/mainboard/google/kahlee/variants/baseboard/include/baseboard/variants.h
+++ b/src/mainboard/google/kahlee/variants/baseboard/include/baseboard/variants.h
@@ -19,7 +19,7 @@
 
 #include <stddef.h>
 #include <soc/smi.h>
-#include <AGESA.h>
+#include <agesawrapper.h>
 
 const GPIO_CONTROL *get_gpio_table(void);
 const struct sci_source *get_gpe_table(size_t *num);
diff --git a/src/mainboard/google/kahlee/variants/kahlee/gpio.c b/src/mainboard/google/kahlee/variants/kahlee/gpio.c
index 0fd5f400cb..d90a99cbd7 100644
--- a/src/mainboard/google/kahlee/variants/kahlee/gpio.c
+++ b/src/mainboard/google/kahlee/variants/kahlee/gpio.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  */
 
-#include <AGESA.h>
-#include <FchPlatform.h>
+#include <agesawrapper.h>
 #include <baseboard/variants.h>
 #include <soc/smi.h>
 #include <soc/southbridge.h>