From 2b95da01e6bbdd8b001fa1ff2830dbaa70f14c3e Mon Sep 17 00:00:00 2001
From: Kyösti Mälkki <kyosti.malkki@gmail.com>
Date: Sat, 15 Feb 2014 10:19:23 +0200
Subject: uart8250mem: Unify calls with generic UART
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

NOTE: UART base for SMM continues to be broken, as it does not use
the address resource allocator has assigned.

Change-Id: I79f2ca8427a33a3c719adfe277c24dab79a33ef3
Signed-off-by: Kyösti Mälkki <kyosti.malkki@gmail.com>
Reviewed-on: http://review.coreboot.org/5235
Tested-by: build bot (Jenkins)
Reviewed-by: Stefan Reinauer <stefan.reinauer@coreboot.org>
---
 src/cpu/x86/smm/smiutil.c | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

(limited to 'src/cpu/x86')

diff --git a/src/cpu/x86/smm/smiutil.c b/src/cpu/x86/smm/smiutil.c
index 3702e5c179..43731bc3c8 100644
--- a/src/cpu/x86/smm/smiutil.c
+++ b/src/cpu/x86/smm/smiutil.c
@@ -24,13 +24,8 @@
 #include <cpu/x86/smm.h>
 #include <console/console.h>
 #include <console/uart.h>
-#include <uart8250.h>
 #include <console/vtxprintf.h>
 
-#if CONFIG_CONSOLE_SERIAL8250MEM
-static u32 serial8250mem_base_address = 0;
-#endif
-
 void console_tx_flush(void)
 {
 }
@@ -41,8 +36,7 @@ void console_tx_byte(unsigned char byte)
 		console_tx_byte('\r');
 
 #if CONFIG_CONSOLE_SERIAL8250MEM
-	if (serial8250mem_base_address)
-		uart8250_mem_tx_byte(serial8250mem_base_address, byte);
+	uart_tx_byte(byte);
 #endif
 #if CONFIG_CONSOLE_SERIAL8250
 	uart_tx_byte(byte);
@@ -57,7 +51,7 @@ void console_init(void)
 	uart_init();
 #endif
 #if CONFIG_CONSOLE_SERIAL8250MEM
-	serial8250mem_base_address = uart_mem_init();
+	uart_init();
 #endif
 #else
 	console_loglevel = 1;
-- 
cgit v1.2.3