Alexandru Gagniuc (mr.nuke.me@gmail.com) just uploaded a new patch set to gerrit, which you can find at https://review.coreboot.org/12875
-gerrit
commit 1fb18fdd66d0e8f75d23ff44fdf23cc6111b2dd7 Author: Alexandru Gagniuc mr.nuke.me@gmail.com Date: Fri Jan 8 22:00:21 2016 -0800
cpu/qemu-x86: Enable bootblock console
This brings the qemu C environment bootblock closer to the generic bootblock in lib/. This is a step before the bootblocks can be converged, but the code is not yet ready for unification. When running qemu with the "-serial stdio" flag, the "bootblock starting..." message now appears on the console.
Change-Id: I121bce620cf7f8a713e7dad1833cff1b0dc2116f Signed-off-by: Alexandru Gagniuc mr.nuke.me@gmail.com --- src/cpu/qemu-x86/bootblock.c | 4 ++++ 1 file changed, 4 insertions(+)
diff --git a/src/cpu/qemu-x86/bootblock.c b/src/cpu/qemu-x86/bootblock.c index 92dd6f7..d62c47e 100644 --- a/src/cpu/qemu-x86/bootblock.c +++ b/src/cpu/qemu-x86/bootblock.c @@ -11,6 +11,7 @@
#include <arch/cpu.h> #include <cbfs.h> +#include <console/console.h> #include <halt.h>
/* Called from assembly. Prototype not needed by external .c file */ @@ -42,6 +43,9 @@ asmlinkage void bootblock_main(uint32_t bist, uint32_t tsc_lo, uint32_t tsc_hi) struct cbfs_stage *romstage; const char* target1 = get_next_stage_name();
+ if (IS_ENABLED(CONFIG_BOOTBLOCK_CONSOLE)) + console_init(); + romstage = cbfs_boot_map_with_leak(target1, CBFS_TYPE_STAGE, NULL);
/*