Patch set updated for coreboot: ea59e0a console: Remove old fix for DEBUG_SMI

[Kyösti Mälkki]

Kyösti Mälkki ([e-mail]) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/5335

-gerrit

commit ea59e0ab00668904daca46ec43b320f1d6e3d7e1
Author: Kyösti Mälkki 
Date:   Tue Feb 4 19:50:07 2014 +0200

console: Remove old fix for DEBUG_SMI

No longer needed as wrap_putchar() survives SMM relocation to TSEG.

Change-Id: I6143844b0b9902ef63baf3e5781a5dc4f54234be
    Signed-off-by: Kyösti Mälkki 
---
 src/console/printk.c          | 2 +-
 src/console/vtxprintf.c       | 5 -----
 src/include/console/console.h | 1 -
 3 files changed, 1 insertion(+), 7 deletions(-)

diff --git a/src/console/printk.c b/src/console/printk.c
index be16c7b..e86c930 100644
--- a/src/console/printk.c
+++ b/src/console/printk.c
@@ -14,7 +14,7 @@

DECLARE_SPIN_LOCK(console_lock)

-void wrap_putchar(unsigned char byte, void *data)
+static void wrap_putchar(unsigned char byte, void *data)
 {
    console_tx_byte(byte);
 }
diff --git a/src/console/vtxprintf.c b/src/console/vtxprintf.c
index d4d70b6..23db037 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 d8681e1..4dd14e5 100644
--- a/src/include/console/console.h
+++ b/src/include/console/console.h
@@ -77,7 +77,6 @@ static inline void do_vtxprintf(const char *fmt, va_list args) {}

int do_printk(int msg_level, const char *fmt, ...) __attribute__((format(printf, 2, 3)));
 void do_vtxprintf(const char *fmt, va_list args);
-void wrap_putchar(char byte, void *data);

#define printk(LEVEL, fmt, args...)				\
    do {							\