From 9c1dc7cbe17cc77636c7c7121c3ccb1dbb55c7b7 Mon Sep 17 00:00:00 2001
From: Richard Spiegel <richard.spiegel@amd.corp-partner.google.com>
Date: Mon, 7 May 2018 07:36:16 -0700
Subject: vendorcode/amd/pi/00670F00: Remove unneeded includes

Vendor code has several headers included into source code that are not
needed in order to build them. Remove unneeded #include. This is part of
controlling the build of unneeded procedures within vendor code.

BUG=b:78610011
TEST=Build grunt.

Change-Id: Id7d451b6be564632836fc64fd343131edb85183a
Signed-off-by: Richard Spiegel <richard.spiegel@silverbackltd.com>
Reviewed-on: https://review.coreboot.org/26134
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Martin Roth <martinroth@google.com>
---
 src/vendorcode/amd/pi/00670F00/Lib/amdlib.c                   |  2 --
 src/vendorcode/amd/pi/00670F00/Proc/Fch/Common/FchPeLib.c     | 11 +++++++----
 src/vendorcode/amd/pi/00670F00/Proc/Fch/Common/MemLib.c       |  5 ++++-
 .../amd/pi/00670F00/Proc/Psp/PspBaseLib/PspBaseLib.c          |  5 ++++-
 src/vendorcode/amd/pi/00670F00/binaryPI/AGESA.c               |  5 -----
 5 files changed, 15 insertions(+), 13 deletions(-)

diff --git a/src/vendorcode/amd/pi/00670F00/Lib/amdlib.c b/src/vendorcode/amd/pi/00670F00/Lib/amdlib.c
index 38df87804f..849d1a24e3 100644
--- a/src/vendorcode/amd/pi/00670F00/Lib/amdlib.c
+++ b/src/vendorcode/amd/pi/00670F00/Lib/amdlib.c
@@ -45,8 +45,6 @@
 
 #include <AGESA.h>
 #include <cpuRegisters.h>
-#include <Ids.h>
-#include <Porting.h>
 #include "amdlib.h"
 CODE_GROUP (G1_PEICC)
 RDATA_GROUP (G1_PEICC)
diff --git a/src/vendorcode/amd/pi/00670F00/Proc/Fch/Common/FchPeLib.c b/src/vendorcode/amd/pi/00670F00/Proc/Fch/Common/FchPeLib.c
index c833a9f2a6..057bf72368 100644
--- a/src/vendorcode/amd/pi/00670F00/Proc/Fch/Common/FchPeLib.c
+++ b/src/vendorcode/amd/pi/00670F00/Proc/Fch/Common/FchPeLib.c
@@ -43,10 +43,13 @@
 
 #include "FchPlatform.h"
 #include  "cpuFamilyTranslation.h"
-//#include  "Porting.h"
-//#include  "AMD.h"
-//#include  "amdlib.h"
-#include  "heapManager.h"
+ /*
+  * Headers removed for coreboot.
+  * #include  "Porting.h"
+  * #include  "AMD.h"
+  * #include  "amdlib.h"
+  * #include  "heapManager.h"
+  */
 #define FILECODE PROC_FCH_COMMON_FCHPELIB_FILECODE
 
 /*----------------------------------------------------------------------------------------*/
diff --git a/src/vendorcode/amd/pi/00670F00/Proc/Fch/Common/MemLib.c b/src/vendorcode/amd/pi/00670F00/Proc/Fch/Common/MemLib.c
index 8313d81ded..de263dd3d2 100644
--- a/src/vendorcode/amd/pi/00670F00/Proc/Fch/Common/MemLib.c
+++ b/src/vendorcode/amd/pi/00670F00/Proc/Fch/Common/MemLib.c
@@ -41,7 +41,10 @@
  *
  ***************************************************************************/
 #include "FchPlatform.h"
-#include "Ids.h"
+ /*
+  * Header removed for coreboot.
+  * #include  "Ids.h"
+  */
 #define FILECODE PROC_FCH_COMMON_MEMLIB_FILECODE
 
 
diff --git a/src/vendorcode/amd/pi/00670F00/Proc/Psp/PspBaseLib/PspBaseLib.c b/src/vendorcode/amd/pi/00670F00/Proc/Psp/PspBaseLib/PspBaseLib.c
index e49fb789eb..1739c70167 100644
--- a/src/vendorcode/amd/pi/00670F00/Proc/Psp/PspBaseLib/PspBaseLib.c
+++ b/src/vendorcode/amd/pi/00670F00/Proc/Psp/PspBaseLib/PspBaseLib.c
@@ -48,7 +48,10 @@
  */
 #include "AGESA.h"
 #include "Filecode.h"
-#include "Fch.h"
+ /*
+  * Header removed for coreboot.
+  * #include  "Fch.h"
+  */
 #include "PspBaseLib.h"
 
 #define FILECODE PROC_PSP_PSPBASELIB_PSPBASELIB_FILECODE
diff --git a/src/vendorcode/amd/pi/00670F00/binaryPI/AGESA.c b/src/vendorcode/amd/pi/00670F00/binaryPI/AGESA.c
index 0985504da7..4e6262da33 100644
--- a/src/vendorcode/amd/pi/00670F00/binaryPI/AGESA.c
+++ b/src/vendorcode/amd/pi/00670F00/binaryPI/AGESA.c
@@ -39,12 +39,7 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
  ***************************************************************************/
-// TODO This list needs to be pruned of anything that is not API
-#include "AGESA.h"
 #include <amdblocks/agesawrapper.h>
-#include "cbfs.h"
-#include <console/console.h>
-#include <commonlib/loglevel.h>
 
 CONST UINT32 ImageSignature = IMAGE_SIGNATURE;
 CONST UINT32 ModuleSignature = MODULE_SIGNATURE;
-- 
cgit v1.2.3