From 59495543db32ac562495d10513c7b78cb2acfb3d Mon Sep 17 00:00:00 2001 From: Yu-Ping Wu Date: Thu, 18 Jun 2020 15:55:30 +0800 Subject: libpayload: gdb: Condition video console init on LP_VIDEO_CONSOLE With the stub video_console_init() removed from depthcharge in CL:2241493, depthcharge will fail to compile: payloads/libpayload/gdb/stub.c:76: undefined reference to `video_console_init' Since video_console_init() is meant to be implemented in libpayload, libpayload should be consistent with itself by not calling this function when it's not implemented (i.e., when !LP_VIDEO_CONSOLE). Therefore, initialize video console only if LP_VIDEO_CONSOLE is set. BRANCH=none BUG=none TEST=USE="menu_ui" emerge-gale depthcharge Change-Id: Ic45f9073330258cb77301003484ec525b2404180 Signed-off-by: Yu-Ping Wu Reviewed-on: https://review.coreboot.org/c/coreboot/+/42505 Reviewed-by: Joel Kitching Tested-by: build bot (Jenkins) --- payloads/libpayload/gdb/stub.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/payloads/libpayload/gdb/stub.c b/payloads/libpayload/gdb/stub.c index 694577e8d7..019f27fcac 100644 --- a/payloads/libpayload/gdb/stub.c +++ b/payloads/libpayload/gdb/stub.c @@ -73,7 +73,8 @@ static void gdb_output_write(const void *buffer, size_t count) if (!gdb_state.resumed) { /* Must be a die_if() in GDB (or a bug), so bail out and die. */ gdb_exit(-1); - video_console_init(); + if (CONFIG(LP_VIDEO_CONSOLE)) + video_console_init(); puts("GDB died, redirecting its last words to the screen:\n"); console_write(buffer, count); } else { -- cgit v1.2.3