From c6918f99d73541246f5a7d6d0f5723c674737fbe Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ky=C3=B6sti=20M=C3=A4lkki?= <kyosti.malkki@gmail.com>
Date: Mon, 11 Jun 2018 08:52:22 +0300
Subject: AGESA: Move heap_status_name() implementation
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Place it within class libagesa to avoid including
AGESA internal header heapManager.h in coreboot
proper build CPPFLAGS.

Change-Id: Iae86d6631d7a6ba6ea2588a53b292b435dfd7861
Signed-off-by: Kyösti Mälkki <kyosti.malkki@gmail.com>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/31511
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Patrick Georgi <pgeorgi@google.com>
---
 src/drivers/amd/agesa/eventlog.c      | 16 ----------------
 src/drivers/amd/agesa/state_machine.c |  2 ++
 2 files changed, 2 insertions(+), 16 deletions(-)

(limited to 'src/drivers/amd')

diff --git a/src/drivers/amd/agesa/eventlog.c b/src/drivers/amd/agesa/eventlog.c
index 23e31ba7d312..df3759cf350c 100644
--- a/src/drivers/amd/agesa/eventlog.c
+++ b/src/drivers/amd/agesa/eventlog.c
@@ -21,8 +21,6 @@
 #include <AGESA.h>
 #include <AMD.h>
 
-#include <heapManager.h>
-
 static const char undefined[] = "undefined";
 
 /* Match order of enum AGESA_STRUCT_NAME. */
@@ -34,11 +32,6 @@ static const char *AgesaFunctionNameStr[] = {
 	"Amd2dDataEye", "AmdS3FinalRestore", "AmdInitRtb"
 };
 
-/* heapManager.h */
-static const char *HeapStatusStr[] = {
-	"DoNotExistYet", "LocalCache", "TempMem", "SystemMem", "DoNotExistAnymore","S3Resume"
-};
-
 /* This function has to match with enumeration of AGESA_STRUCT_NAME defined
  * inside AMD.h header file. Unfortunately those are different across
  * different vendorcode subtrees.
@@ -64,15 +57,6 @@ const char *agesa_struct_name(int state)
 	return AgesaFunctionNameStr[index];
 }
 
-const char *heap_status_name(int status)
-{
-	if ((status < HEAP_DO_NOT_EXIST_YET) || (status > HEAP_S3_RESUME))
-		return undefined;
-
-	int index = status - HEAP_DO_NOT_EXIST_YET;
-	return HeapStatusStr[index];
-}
-
 /*
  * Possible AGESA_STATUS values:
  *
diff --git a/src/drivers/amd/agesa/state_machine.c b/src/drivers/amd/agesa/state_machine.c
index dfd64c3d522d..90bf038f7119 100644
--- a/src/drivers/amd/agesa/state_machine.c
+++ b/src/drivers/amd/agesa/state_machine.c
@@ -25,6 +25,8 @@
 #include <northbridge/amd/agesa/agesa_helper.h>
 #include <northbridge/amd/agesa/BiosCallOuts.h>
 #include <amdlib.h>
+
+#include <debug_util.h>
 #include <AMD.h>
 
 #if CONFIG(CPU_AMD_AGESA_OPENSOURCE)
-- 
cgit v1.2.3