summaryrefslogtreecommitdiff
path: root/payloads
diff options
context:
space:
mode:
authorYu-Ping Wu <yupingso@chromium.org>2020-06-18 15:55:30 +0800
committerPatrick Georgi <pgeorgi@google.com>2020-06-22 12:24:42 +0000
commit59495543db32ac562495d10513c7b78cb2acfb3d (patch)
tree473dba1c3ad270b6a926d5a58a292845efcaaf09 /payloads
parent2c807ff6fe085b645d6da42a0472f2c31d19ec29 (diff)
downloadcoreboot-59495543db32ac562495d10513c7b78cb2acfb3d.tar.xz
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 <yupingso@chromium.org> Reviewed-on: https://review.coreboot.org/c/coreboot/+/42505 Reviewed-by: Joel Kitching <kitching@google.com> Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Diffstat (limited to 'payloads')
-rw-r--r--payloads/libpayload/gdb/stub.c3
1 files changed, 2 insertions, 1 deletions
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 {