From 7b23ae0e8938eb71453cbc28c2cc74c14a4039ae Mon Sep 17 00:00:00 2001 From: Kyösti Mälkki Date: Fri, 4 Jul 2014 16:14:37 +0300 Subject: AGESA: Trace execution with AGESAWRAPPER() MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Implement logging just once to have uniform output. Change-Id: I8db694a3bf6b1af459bdf98f7acb99edf4dd07f7 Signed-off-by: Kyösti Mälkki Reviewed-on: http://review.coreboot.org/6180 Tested-by: build bot (Jenkins) Reviewed-by: Edward O'Callaghan --- src/mainboard/amd/thatcher/romstage.c | 46 +++++++---------------------------- 1 file changed, 9 insertions(+), 37 deletions(-) (limited to 'src/mainboard/amd/thatcher/romstage.c') diff --git a/src/mainboard/amd/thatcher/romstage.c b/src/mainboard/amd/thatcher/romstage.c index 10dac122e3..f3108ffcab 100644 --- a/src/mainboard/amd/thatcher/romstage.c +++ b/src/mainboard/amd/thatcher/romstage.c @@ -31,6 +31,7 @@ #include #include "cpu/amd/car.h" #include "agesawrapper.h" +#include #include "cpu/x86/bist.h" #include "cpu/x86/lapic.h" #include "southbridge/amd/agesa/hudson/hudson.h" @@ -46,7 +47,7 @@ void cache_as_ram_main(unsigned long bist, unsigned long cpu_init_detectedx) u32 val; u8 byte; device_t dev; - val = agesawrapper_amdinitmmio(); + AGESAWRAPPER(amdinitmmio); hudson_lpc_port80(); //__asm__ volatile ("1: jmp 1b"); @@ -79,53 +80,24 @@ 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); - printk(BIOS_DEBUG, "agesawrapper_amdinitreset "); - val = agesawrapper_amdinitreset(); - if(val) { - printk(BIOS_DEBUG, "agesawrapper_amdinitreset failed: %x \n", val); - } - + AGESAWRAPPER(amdinitreset); post_code(0x39); - val = agesawrapper_amdinitearly (); - if(val) { - printk(BIOS_DEBUG, "agesawrapper_amdinitearly failed: %x \n", val); - } - printk(BIOS_DEBUG, "Got past agesawrapper_amdinitearly\n"); - + AGESAWRAPPER(amdinitearly); int s3resume = acpi_is_wakeup_early() && acpi_s3_resume_allowed(); if (!s3resume) { post_code(0x40); - val = agesawrapper_amdinitpost (); - if(val) { - printk(BIOS_DEBUG, "agesawrapper_amdinitpost failed: %x \n", val); - } - printk(BIOS_DEBUG, "Got past agesawrapper_amdinitpost\n"); - + AGESAWRAPPER(amdinitpost); post_code(0x41); - val = agesawrapper_amdinitenv (); - if(val) { - printk(BIOS_DEBUG, "agesawrapper_amdinitenv failed: %x \n", val); - } - printk(BIOS_DEBUG, "Got past agesawrapper_amdinitenv\n"); + AGESAWRAPPER(amdinitenv); disable_cache_as_ram(); } else { /* S3 detect */ printk(BIOS_INFO, "S3 detected\n"); post_code(0x60); - printk(BIOS_DEBUG, "agesawrapper_amdinitresume "); - val = agesawrapper_amdinitresume(); - if (val) - printk(BIOS_DEBUG, "error level: %x \n", val); - else - printk(BIOS_DEBUG, "passed.\n"); - - printk(BIOS_DEBUG, "agesawrapper_amds3laterestore "); - val = agesawrapper_amds3laterestore (); - if (val) - printk(BIOS_DEBUG, "error level: %x \n", val); - else - printk(BIOS_DEBUG, "passed.\n"); + AGESAWRAPPER(amdinitresume); + + AGESAWRAPPER(amds3laterestore); post_code(0x61); prepare_for_resume(); -- cgit v1.2.3