[coreboot-gerrit] New patch to review for coreboot: console: Remove CONFIG_CHROMEOS requirement from do_printk_va_list()

[Julius Werner (jwerner@chromium.org)]

Julius Werner (jwerner at chromium.org) just uploaded a new patch set to gerrit, which you can find at https://review.coreboot.org/16230

-gerrit

commit be14df63d298071857bc3647f9fd4209fc5f7bd7
Author: Julius Werner <jwerner at chromium.org>
Date:   Mon Aug 15 16:14:15 2016 -0700

    console: Remove CONFIG_CHROMEOS requirement from do_printk_va_list()
    
    This function is a generic function with a lot of possible uses, and
    should not be tied to CONFIG_CHROMEOS (especially since it's called from
    vboot code which is now trying to be independent of CONFIG_CHROMEOS).
    There is a cryptic comment about a clash with certain AMD headers, but
    no extra information to follow up... I'll let Jenkins judge whether it
    still has any merit today.
    
    Change-Id: I44e868d2fd8e1368eeda2f10a35d0a2bd7259759
    Signed-off-by: Julius Werner <jwerner at chromium.org>
---
 src/include/console/console.h | 13 +++----------
 1 file changed, 3 insertions(+), 10 deletions(-)

diff --git a/src/include/console/console.h b/src/include/console/console.h
index f0ab031..09137a9 100644
--- a/src/include/console/console.h
+++ b/src/include/console/console.h
@@ -20,6 +20,7 @@
 #include <rules.h>
 #include <arch/cpu.h>
 #include <console/post_codes.h>
+#include <console/vtxprintf.h>
 #include <commonlib/loglevel.h>
 
 #ifndef __ROMCC__
@@ -48,6 +49,7 @@ void __attribute__ ((noreturn)) die(const char *msg);
 asmlinkage void console_init(void);
 int console_log_level(int msg_level);
 int do_printk(int msg_level, const char *fmt, ...) __attribute__((format(printf, 2, 3)));
+void do_printk_va_list(int msg_level, const char *fmt, va_list args);
 void do_putchar(unsigned char byte);
 
 #define printk(LEVEL, fmt, args...)	\
@@ -57,17 +59,8 @@ void do_putchar(unsigned char byte);
 static inline void console_init(void) {}
 static inline int console_log_level(int msg_level) { return 0; }
 static inline void printk(int LEVEL, const char *fmt, ...) {}
-static inline void do_putchar(unsigned char byte) {}
-#endif
-
-#if CONFIG_CHROMEOS
-/* FIXME: Collision of varargs with AMD headers without guard. */
-#include <console/vtxprintf.h>
-#if __CONSOLE_ENABLE__
-void do_printk_va_list(int msg_level, const char *fmt, va_list args);
-#else
 static inline void do_printk_va_list(int l, const char *fmt, va_list args) {}
-#endif
+static inline void do_putchar(unsigned char byte) {}
 #endif
 
 #endif /* !__ROMCC__ */