summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPatrick Rudolph <patrick.rudolph@9elements.com>2019-03-10 17:36:49 +0100
committerPatrick Rudolph <siro@das-labor.org>2019-03-23 07:05:28 +0000
commit6f5dacae13a81b93fb8bb1dc80847b24ac7d6959 (patch)
tree6a85dbce0c1fd7839314b61ae3f21af186ab32bc
parentfd159550b882205d3d0f59231b495c0e912f8175 (diff)
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>
-rw-r--r--src/drivers/emulation/qemu/Makefile.inc2
-rw-r--r--src/include/console/qemu_debugcon.h3
2 files changed, 4 insertions, 1 deletions
diff --git a/src/drivers/emulation/qemu/Makefile.inc b/src/drivers/emulation/qemu/Makefile.inc
index 33516272dd..d9db1304bb 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 359e01adcf..f0252ee210 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)
{