commit 2fba476a6e7e4578e0590b56d02147e01f100d8a
author Arthur Heymans <arthur@aheymans.xyz> Mon Nov 06 15:33:23 2023 +0100
committer Felix Held <felix-coreboot@felixheld.de> Tue Nov 07 17:23:32 2023 +0000
tree 65b239774d761910f5d4e70988f425933df967f9
parent d0cb97ef2e6e5088f6b256d5a4e9f0665eaa6218

console.c: Enable gdb support in bootblock

This code was written in a romcc bootblock time. There is no reason why
it would not work in bootblock now.

Untested but expected to work.

Signed-off-by: Arthur Heymans <arthur@aheymans.xyz>
Change-Id: I34812fbcd1222eceeb9870b9cbb7431ead63ce6a
Reviewed-on: https://review.coreboot.org/c/coreboot/+/78936
Reviewed-by: Martin L Roth <gaumless@gmail.com>
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>

src/console/console.c

diff --git a/src/console/console.c b/src/console/console.c
index 9a079ed..bb9d374 100644
--- a/src/console/console.c
+++ b/src/console/console.c
@@ -86,7 +86,7 @@
 		console_tx_byte(*buffer++);
 }
 
-#if CONFIG(GDB_STUB) && (ENV_ROMSTAGE || ENV_RAMSTAGE)
+#if CONFIG(GDB_STUB) && (ENV_ROMSTAGE_OR_BEFORE || ENV_RAMSTAGE)
 void gdb_hw_init(void)
 {
 	__gdb_hw_init();

src/include/console/uart.h

diff --git a/src/include/console/uart.h b/src/include/console/uart.h
index 2e23d43..ca03ecb 100644
--- a/src/include/console/uart.h
+++ b/src/include/console/uart.h
@@ -84,7 +84,7 @@
 static inline void __uart_tx_flush(void)	{}
 #endif
 
-#if CONFIG(GDB_STUB) && (ENV_ROMSTAGE || ENV_RAMSTAGE)
+#if CONFIG(GDB_STUB) && (ENV_ROMSTAGE_OR_BEFORE || ENV_RAMSTAGE)
 #define CONF_UART_FOR_GDB	CONFIG_UART_FOR_CONSOLE
 static inline void __gdb_hw_init(void)	{ uart_init(CONF_UART_FOR_GDB); }
 static inline void __gdb_tx_byte(u8 data)