Patrick Rudolph has submitted this change and it was merged. ( https://review.coreboot.org/c/coreboot/+/31833 )
Change subject: console/qemu_debugcon: Support additional stages ......................................................................
console/qemu_debugcon: Support additional stages
Add support for bootblock and postcar, which were introduced on qemu in the last few month.
Fixes non-working debugcon in those stages.
Change-Id: I553f12c2105237d81ae3f492ec85b17434d8334c Signed-off-by: Patrick Rudolph patrick.rudolph@9elements.com Reviewed-on: https://review.coreboot.org/c/coreboot/+/31833 Reviewed-by: Arthur Heymans arthur@aheymans.xyz Reviewed-by: Philipp Deppenwiese zaolin.daisuki@gmail.com Reviewed-by: Paul Menzel paulepanter@users.sourceforge.net Tested-by: build bot (Jenkins) no-reply@coreboot.org --- M src/drivers/emulation/qemu/Makefile.inc M src/include/console/qemu_debugcon.h 2 files changed, 4 insertions(+), 1 deletion(-)
Approvals: build bot (Jenkins): Verified Paul Menzel: Looks good to me, but someone else must approve Philipp Deppenwiese: Looks good to me, approved Arthur Heymans: Looks good to me, approved
diff --git a/src/drivers/emulation/qemu/Makefile.inc b/src/drivers/emulation/qemu/Makefile.inc index 3351627..d9db130 100644 --- a/src/drivers/emulation/qemu/Makefile.inc +++ b/src/drivers/emulation/qemu/Makefile.inc @@ -1,4 +1,6 @@ +bootblock-$(CONFIG_CONSOLE_QEMU_DEBUGCON) += qemu_debugcon.c romstage-$(CONFIG_CONSOLE_QEMU_DEBUGCON) += qemu_debugcon.c +postcar-$(CONFIG_CONSOLE_QEMU_DEBUGCON) += qemu_debugcon.c ramstage-$(CONFIG_CONSOLE_QEMU_DEBUGCON) += qemu_debugcon.c
ramstage-$(CONFIG_DRIVERS_EMULATION_QEMU_BOCHS) += bochs.c diff --git a/src/include/console/qemu_debugcon.h b/src/include/console/qemu_debugcon.h index 359e01a..f0252ee 100644 --- a/src/include/console/qemu_debugcon.h +++ b/src/include/console/qemu_debugcon.h @@ -6,7 +6,8 @@ void qemu_debugcon_init(void); void qemu_debugcon_tx_byte(unsigned char data);
-#if CONFIG(CONSOLE_QEMU_DEBUGCON) && (ENV_ROMSTAGE || ENV_RAMSTAGE) +#if CONFIG(CONSOLE_QEMU_DEBUGCON) && \ + (ENV_ROMSTAGE || ENV_RAMSTAGE || ENV_POSTCAR || ENV_BOOTBLOCK) static inline void __qemu_debugcon_init(void) { qemu_debugcon_init(); } static inline void __qemu_debugcon_tx_byte(u8 data) {