From d0cb97ef2e6e5088f6b256d5a4e9f0665eaa6218 Mon Sep 17 00:00:00 2001 From: Arthur Heymans Date: Mon, 6 Nov 2023 15:24:01 +0100 Subject: [PATCH] console/spkmodem: Make it work for 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 Change-Id: I4113dc3208fe15305d1132136dd33417dd086bfb Reviewed-on: https://review.coreboot.org/c/coreboot/+/78935 Tested-by: build bot (Jenkins) Reviewed-by: Martin L Roth --- src/drivers/pc80/pc/Makefile.inc | 1 + src/include/console/spkmodem.h | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/src/drivers/pc80/pc/Makefile.inc b/src/drivers/pc80/pc/Makefile.inc index c5060116a7..3c1ce48be9 100644 --- a/src/drivers/pc80/pc/Makefile.inc +++ b/src/drivers/pc80/pc/Makefile.inc @@ -7,6 +7,7 @@ ramstage-y += i8259.c ramstage-y += keyboard.c ramstage-$(CONFIG_SPKMODEM) += spkmodem.c romstage-$(CONFIG_SPKMODEM) += spkmodem.c +bootblock-$(CONFIG_SPKMODEM) += spkmodem.c all_x86-y += i8254.c smm-y += i8254.c diff --git a/src/include/console/spkmodem.h b/src/include/console/spkmodem.h index fe4181c51b..dfafd79e7f 100644 --- a/src/include/console/spkmodem.h +++ b/src/include/console/spkmodem.h @@ -8,7 +8,7 @@ void spkmodem_init(void); void spkmodem_tx_byte(unsigned char c); -#if CONFIG(SPKMODEM) && (ENV_ROMSTAGE || ENV_RAMSTAGE) +#if CONFIG(SPKMODEM) && (ENV_ROMSTAGE_OR_BEFORE || ENV_RAMSTAGE) static inline void __spkmodem_init(void) { spkmodem_init(); } static inline void __spkmodem_tx_byte(u8 data) { spkmodem_tx_byte(data); } #else