AGESA: Trace execution with AGESAWRAPPER()

Implement logging just once to have uniform output.

Change-Id: I8db694a3bf6b1af459bdf98f7acb99edf4dd07f7
Signed-off-by: Kyösti Mälkki <kyosti.malkki@gmail.com>
Reviewed-on: http://review.coreboot.org/6180
Tested-by: build bot (Jenkins)
Reviewed-by: Edward O'Callaghan <eocallaghan@alterapraxis.com>

2 files changed, 10 insertions, 48 deletions

diff --git a/src/mainboard/supermicro/h8qgi/romstage.c b/src/mainboard/supermicro/h8qgi/romstage.c
index 03d501dbd0..4273fdb82a 100644
--- a/src/mainboard/supermicro/h8qgi/romstage.c
+++ b/src/mainboard/supermicro/h8qgi/romstage.c
@@ -28,6 +28,7 @@
 #include "cpu/x86/lapic.h"
 #include "cpu/amd/car.h"
 #include "agesawrapper.h"
+#include <northbridge/amd/agesa/agesawrapper_call.h>
 #include "northbridge/amd/agesa/family10/reset_test.h"
 #include <nb_cimx.h>
 #include <sb_cimx.h>
@@ -65,12 +66,7 @@ void cache_as_ram_main(unsigned long bist, unsigned long cpu_init_detectedx)
 	printk(BIOS_DEBUG, "cpu_init_detectedx = %08lx \n", cpu_init_detectedx);
 
 	post_code(0x37);
-	val = agesawrapper_amdinitreset();
-	if (val) {
-		printk(BIOS_DEBUG, "agesawrapper_amdinitreset failed: %x \n", val);
-	} else {
-		printk(BIOS_DEBUG, "agesawrapper_amdinitreset passed\n");
-	}
+	AGESAWRAPPER(amdinitreset);
 
 	if (!cpu_init_detectedx && boot_cpu()) {
 		post_code(0x38);
@@ -85,12 +81,7 @@ void cache_as_ram_main(unsigned long bist, unsigned long cpu_init_detectedx)
 		sb_Poweron_Init();
 	}
 	post_code(0x3B);
-	val = agesawrapper_amdinitearly();
-	if(val) {
-		printk(BIOS_DEBUG, "agesawrapper_amdinitearly failed: %x \n", val);
-	} else {
-		printk(BIOS_DEBUG, "agesawrapper_amdinitearly passed\n");
-	}
+	AGESAWRAPPER(amdinitearly);
 
 	post_code(0x3C);
 	/* W83627DHG pin89,90 function select is RSTOUT3#, RSTOUT2# by default.
@@ -110,20 +101,10 @@ void cache_as_ram_main(unsigned long bist, unsigned long cpu_init_detectedx)
 	}
 
 	post_code(0x40);
-	val = agesawrapper_amdinitpost();
-	if (val) {
-		printk(BIOS_DEBUG, "agesawrapper_amdinitpost failed: %x \n", val);
-	} else {
-		printk(BIOS_DEBUG, "agesawrapper_amdinitpost passed\n");
-	}
+	AGESAWRAPPER(amdinitpost);
 
 	post_code(0x41);
-	val = agesawrapper_amdinitenv();
-	if(val) {
-		printk(BIOS_DEBUG, "agesawrapper_amdinitenv failed: %x \n", val);
-	}
-	printk(BIOS_DEBUG, "agesawrapper_amdinitenv passed\n");
-
+	AGESAWRAPPER(amdinitenv);
 	post_code(0x42);
 
 	post_code(0x50);
diff --git a/src/mainboard/supermicro/h8scm/romstage.c b/src/mainboard/supermicro/h8scm/romstage.c
index b80b4de731..4084addfb9 100644
--- a/src/mainboard/supermicro/h8scm/romstage.c
+++ b/src/mainboard/supermicro/h8scm/romstage.c
@@ -28,6 +28,7 @@
 #include "cpu/x86/lapic.h"
 #include "cpu/amd/car.h"
 #include "agesawrapper.h"
+#include <northbridge/amd/agesa/agesawrapper_call.h>
 #include "northbridge/amd/agesa/family10/reset_test.h"
 #include <nb_cimx.h>
 #include <sb_cimx.h>
@@ -64,12 +65,7 @@ void cache_as_ram_main(unsigned long bist, unsigned long cpu_init_detectedx)
 	printk(BIOS_DEBUG, "cpu_init_detectedx = %08lx \n", cpu_init_detectedx);
 
 	post_code(0x37);
-	val = agesawrapper_amdinitreset();
-	if (val) {
-		printk(BIOS_DEBUG, "agesawrapper_amdinitreset failed: %x \n", val);
-	} else {
-		printk(BIOS_DEBUG, "agesawrapper_amdinitreset passed\n");
-	}
+	AGESAWRAPPER(amdinitreset);
 
 	if (!cpu_init_detectedx && boot_cpu()) {
 		post_code(0x38);
@@ -84,12 +80,7 @@ void cache_as_ram_main(unsigned long bist, unsigned long cpu_init_detectedx)
 		sb_Poweron_Init();
 	}
 	post_code(0x3B);
-	val = agesawrapper_amdinitearly();
-	if(val) {
-		printk(BIOS_DEBUG, "agesawrapper_amdinitearly failed: %x \n", val);
-	} else {
-		printk(BIOS_DEBUG, "agesawrapper_amdinitearly passed\n");
-	}
+	AGESAWRAPPER(amdinitearly);
 
 	post_code(0x3C);
 	nb_Ht_Init();
@@ -104,20 +95,10 @@ void cache_as_ram_main(unsigned long bist, unsigned long cpu_init_detectedx)
 	}
 
 	post_code(0x40);
-	val = agesawrapper_amdinitpost();
-	if (val) {
-		printk(BIOS_DEBUG, "agesawrapper_amdinitpost failed: %x \n", val);
-	} else {
-		printk(BIOS_DEBUG, "agesawrapper_amdinitpost passed\n");
-	}
+	AGESAWRAPPER(amdinitpost);
 
 	post_code(0x41);
-	val = agesawrapper_amdinitenv();
-	if(val) {
-		printk(BIOS_DEBUG, "agesawrapper_amdinitenv failed: %x \n", val);
-	}
-	printk(BIOS_DEBUG, "agesawrapper_amdinitenv passed\n");
-
+	AGESAWRAPPER(amdinitenv);
 	post_code(0x42);
 
 	post_code(0x50);