From 77f43e9b43894f6cdeaab29b2960796b1e3a219e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ky=C3=B6sti=20M=C3=A4lkki?= Date: Tue, 4 Feb 2014 19:50:07 +0200 Subject: [PATCH] console: Remove old fix for DEBUG_SMI MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit No longer needed as wrap_putchar() survives SMM relocation to TSEG. Change-Id: I6143844b0b9902ef63baf3e5781a5dc4f54234be Signed-off-by: Kyösti Mälkki Reviewed-on: http://review.coreboot.org/5335 Tested-by: build bot (Jenkins) Reviewed-by: Patrick Georgi --- src/console/printk.c | 3 +-- src/console/vtxprintf.c | 5 ----- src/include/console/console.h | 1 - 3 files changed, 1 insertion(+), 8 deletions(-) diff --git a/src/console/printk.c b/src/console/printk.c index 1d6b9bf265..2fa160b4f3 100644 --- a/src/console/printk.c +++ b/src/console/printk.c @@ -21,7 +21,7 @@ void do_putchar(unsigned char byte) console_tx_byte(byte); } -void wrap_putchar(unsigned char byte, void *data) +static void wrap_putchar(unsigned char byte, void *data) { do_putchar(byte); } @@ -61,4 +61,3 @@ void do_vtxprintf(const char *fmt, va_list args) console_tx_flush(); } #endif - diff --git a/src/console/vtxprintf.c b/src/console/vtxprintf.c index d4d70b67e3..23db037f5d 100644 --- a/src/console/vtxprintf.c +++ b/src/console/vtxprintf.c @@ -121,11 +121,6 @@ int vtxprintf(void (*tx_byte)(unsigned char byte, void *data), int count; -#if defined(__SMM__) && CONFIG_SMM_TSEG - /* Fix pointer in TSEG */ - tx_byte = wrap_putchar; -#endif - for (count=0; *fmt ; ++fmt) { if (*fmt != '%') { call_tx(*fmt), count++; diff --git a/src/include/console/console.h b/src/include/console/console.h index e19abec831..c184f83e20 100644 --- a/src/include/console/console.h +++ b/src/include/console/console.h @@ -75,7 +75,6 @@ static inline void do_putchar(unsigned char byte) {} int do_printk(int msg_level, const char *fmt, ...) __attribute__((format(printf, 2, 3))); void do_putchar(unsigned char byte); -void wrap_putchar(unsigned char byte, void *data); #define printk(LEVEL, fmt, args...) \ do { \