From b5da8acc34bc71f1dbf930979aae751088890b6e Mon Sep 17 00:00:00 2001 From: Julius Werner Date: Mon, 15 Aug 2016 16:14:15 -0700 Subject: [PATCH] UPSTREAM: console: Change CONFIG_CHROMEOS requirement from do_printk_va_list() CONFIG_VBOOT was recently moved to be independent from CONFIG_CHROMEOS. Change the code guard for do_printk_va_list() accordingly, since it's used by vboot (not Chrome OS) code. BUG=None BRANCH=None TEST=None Signed-off-by: Julius Werner Reviewed-on: https://review.coreboot.org/16230 Reviewed-by: Paul Menzel Reviewed-by: Aaron Durbin Reviewed-by: Kysti Mlkki Change-Id: I44e868d2fd8e1368eeda2f10a35d0a2bd7259759 Reviewed-on: https://chromium-review.googlesource.com/371503 Commit-Ready: Furquan Shaikh Tested-by: Furquan Shaikh Reviewed-by: Martin Roth --- src/include/console/console.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/include/console/console.h b/src/include/console/console.h index f0ab031582..202d47435b 100644 --- a/src/include/console/console.h +++ b/src/include/console/console.h @@ -60,7 +60,7 @@ static inline void printk(int LEVEL, const char *fmt, ...) {} static inline void do_putchar(unsigned char byte) {} #endif -#if CONFIG_CHROMEOS +#if IS_ENABLED(CONFIG_VBOOT) /* FIXME: Collision of varargs with AMD headers without guard. */ #include #if __CONSOLE_ENABLE__