From 1aa35c6f6c2f3d3820d574579e929cbafd4304a7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ky=C3=B6sti=20M=C3=A4lkki?= <kyosti.malkki@gmail.com>
Date: Tue, 21 Oct 2014 14:19:04 +0300
Subject: AGESA: Trace execution with AGESA_EVENTLOG()
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Change-Id: I5601ed92ca808603b0a9edad118ca54aa168aceb
Signed-off-by: Kyösti Mälkki <kyosti.malkki@gmail.com>
Reviewed-on: http://review.coreboot.org/7604
Reviewed-by: Edward O'Callaghan <eocallaghan@alterapraxis.com>
Tested-by: build bot (Jenkins)
---
 src/cpu/amd/agesa/agesawrapper_s3.c | 6 +++---
 src/cpu/amd/agesa/amd_late_init.c   | 5 ++---
 2 files changed, 5 insertions(+), 6 deletions(-)

(limited to 'src/cpu')

diff --git a/src/cpu/amd/agesa/agesawrapper_s3.c b/src/cpu/amd/agesa/agesawrapper_s3.c
index b9f5051617..72bcf42ad3 100644
--- a/src/cpu/amd/agesa/agesawrapper_s3.c
+++ b/src/cpu/amd/agesa/agesawrapper_s3.c
@@ -59,7 +59,7 @@ AGESA_STATUS agesawrapper_amdinitresume(void)
 
 	status = AmdInitResume((AMD_RESUME_PARAMS *) AmdParamStruct.NewStructPtr);
 
-	AGESA_EVENTLOG_(status, AmdParamStruct.StdHeader.HeapStatus);
+	AGESA_EVENTLOG(status, &AmdParamStruct.StdHeader);
 	AmdReleaseStruct(&AmdParamStruct);
 
 	return status;
@@ -93,7 +93,7 @@ AGESA_STATUS agesawrapper_amds3laterestore(void)
 			  (void **)&AmdS3LateParamsPtr->S3DataBlock.VolatileStorage);
 
 	status = AmdS3LateRestore(AmdS3LateParamsPtr);
-	AGESA_EVENTLOG_(status, AmdInterfaceParams.StdHeader.HeapStatus);
+	AGESA_EVENTLOG(status, &AmdInterfaceParams.StdHeader);
 	ASSERT(status == AGESA_SUCCESS);
 
 	return status;
@@ -122,7 +122,7 @@ AGESA_STATUS agesawrapper_amdS3Save(void)
 	AmdS3SaveParamsPtr->StdHeader = AmdInterfaceParams.StdHeader;
 
 	status = AmdS3Save(AmdS3SaveParamsPtr);
-	AGESA_EVENTLOG_(status, AmdInterfaceParams.StdHeader.HeapStatus);
+	AGESA_EVENTLOG(status, &AmdInterfaceParams.StdHeader);
 	ASSERT(status == AGESA_SUCCESS);
 
 	S3DataType = S3DataTypeNonVolatile;
diff --git a/src/cpu/amd/agesa/amd_late_init.c b/src/cpu/amd/agesa/amd_late_init.c
index 26442f4913..53c27590db 100644
--- a/src/cpu/amd/agesa/amd_late_init.c
+++ b/src/cpu/amd/agesa/amd_late_init.c
@@ -21,7 +21,6 @@
 #include <bootstate.h>
 
 #include <northbridge/amd/agesa/agesawrapper.h>
-#include <northbridge/amd/agesa/agesawrapper_call.h>
 
 #if CONFIG_AMD_SB_CIMX
 #include <sb_cimx.h>
@@ -32,7 +31,7 @@ static void agesawrapper_post_device(void *unused)
 	if (acpi_is_wakeup_s3())
 		return;
 
-	AGESAWRAPPER(amdinitlate);
+	agesawrapper_amdinitlate();
 
 #if CONFIG_AMD_SB_CIMX
 	sb_Late_Post();
@@ -40,7 +39,7 @@ static void agesawrapper_post_device(void *unused)
 	if (!acpi_s3_resume_allowed())
 		return;
 
-	AGESAWRAPPER(amdS3Save);
+	agesawrapper_amdS3Save();
 }
 
 BOOT_STATE_INIT_ENTRIES(agesa_bscb) = {
-- 
cgit v1.2.3