From 30fbb4c23e7b867c707d61520c05cc4c6c17e174 Mon Sep 17 00:00:00 2001 From: Kyösti Mälkki Date: Mon, 20 Oct 2014 07:04:55 +0300 Subject: AGESA boards: Fix early agesawrapper_amdinitmmio() MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Regression introduced with commit 7b23ae0 AGESA: Trace execution with AGESAWRAPPER() As the call is made before console_init() is called it must not call any printk(). Debugging Olivehill and Parmer platforms using a custom FPGA (as these boards have no Super-IO UART) have been observed to halt and/or delay at early boot. Change-Id: I3ab4e5378db44aece9046c8636cde1053ce5390d Signed-off-by: Kyösti Mälkki Reviewed-on: http://review.coreboot.org/7059 Reviewed-by: Edward O'Callaghan Tested-by: build bot (Jenkins) Reviewed-by: WANG Siyuan --- src/mainboard/amd/olivehillplus/romstage.c | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) (limited to 'src/mainboard/amd/olivehillplus') diff --git a/src/mainboard/amd/olivehillplus/romstage.c b/src/mainboard/amd/olivehillplus/romstage.c index 88f1163844..6f300ce6fd 100644 --- a/src/mainboard/amd/olivehillplus/romstage.c +++ b/src/mainboard/amd/olivehillplus/romstage.c @@ -41,7 +41,6 @@ void cache_as_ram_main(unsigned long bist, unsigned long cpu_init_detectedx) { u32 val; volatile int halt = 0; - AGESA_STATUS status = AGESA_UNSUPPORTED; /* * In Hudson RRG, PMIOxD2[5:4] is "Drive strength control for @@ -54,14 +53,7 @@ void cache_as_ram_main(unsigned long bist, unsigned long cpu_init_detectedx) outb(0xD2, 0xcd6); outb(0x00, 0xcd7); - /* - * The following should be a call to AGESAWRAPPER() macro, but - * that would use console output before it is initialized. - */ - status = agesawrapper_amdinitmmio(); - if (AGESA_SUCCESS != status) { - printk(BIOS_WARNING, "AmdInitMmio reported %s\n", decodeAGESA_STATUS(status)); - } + AGESAWRAPPER_PRE_CONSOLE(amdinitmmio); hudson_lpc_port80(); -- cgit v1.2.3