[coreboot-gerrit] Patch set updated for coreboot: cpu/qemu-x86 boards: Move BIST check from romstage to bootblock

[Alexandru Gagniuc (mr.nuke.me@gmail.com)]

Alexandru Gagniuc (mr.nuke.me at gmail.com) just uploaded a new patch set to gerrit, which you can find at https://review.coreboot.org/12876

-gerrit

commit e97a2d190d9b66b126d06fe74fa9d177608ab019
Author: Alexandru Gagniuc <mr.nuke.me at gmail.com>
Date:   Fri Jan 8 22:25:22 2016 -0800

    cpu/qemu-x86 boards: Move BIST check from romstage to bootblock
    
    This allows for the removal of the 'bist' parameter in romstage, and
    eventually use of run_romstage() to enter romstage instead of the
    custom inline assembly stub currently in use.
    
    Change-Id: Ia63f3995e94bb63fe62e979dca3e0e6e17378a63
    Signed-off-by: Alexandru Gagniuc <mr.nuke.me at gmail.com>
---
 src/cpu/qemu-x86/bootblock.c                   | 7 +++++++
 src/mainboard/emulation/qemu-i440fx/romstage.c | 4 ----
 src/mainboard/emulation/qemu-q35/romstage.c    | 4 ----
 3 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/src/cpu/qemu-x86/bootblock.c b/src/cpu/qemu-x86/bootblock.c
index d62c47e..b4700a7 100644
--- a/src/cpu/qemu-x86/bootblock.c
+++ b/src/cpu/qemu-x86/bootblock.c
@@ -12,6 +12,7 @@
 #include <arch/cpu.h>
 #include <cbfs.h>
 #include <console/console.h>
+#include <cpu/x86/bist.h>
 #include <halt.h>
 
 /* Called from assembly. Prototype not needed by external .c file */
@@ -46,6 +47,12 @@ asmlinkage void bootblock_main(uint32_t bist, uint32_t tsc_lo, uint32_t tsc_hi)
 	if (IS_ENABLED(CONFIG_BOOTBLOCK_CONSOLE))
 		console_init();
 
+	/*
+	 * TODO: We might want a cleaner way to handle BIST reporting before we
+	 * can converge with the generic bootblock in lib/.
+	 */
+	report_bist_failure(bist);
+
 	romstage = cbfs_boot_map_with_leak(target1, CBFS_TYPE_STAGE, NULL);
 
 	/*
diff --git a/src/mainboard/emulation/qemu-i440fx/romstage.c b/src/mainboard/emulation/qemu-i440fx/romstage.c
index f16f8dd..2d2a87e 100644
--- a/src/mainboard/emulation/qemu-i440fx/romstage.c
+++ b/src/mainboard/emulation/qemu-i440fx/romstage.c
@@ -20,7 +20,6 @@
 #include <device/pnp_def.h>
 #include <pc80/mc146818rtc.h>
 #include <console/console.h>
-#include <cpu/x86/bist.h>
 #include <timestamp.h>
 #include "drivers/pc80/udelay_io.c"
 #include <delay.h>
@@ -38,9 +37,6 @@ void main(unsigned long bist)
 
 	console_init();
 
-	/* Halt if there was a built in self test failure */
-	report_bist_failure(bist);
-
 	//print_pci_devices();
 	//dump_pci_devices();
 
diff --git a/src/mainboard/emulation/qemu-q35/romstage.c b/src/mainboard/emulation/qemu-q35/romstage.c
index d54d8b0..f6b7b63 100644
--- a/src/mainboard/emulation/qemu-q35/romstage.c
+++ b/src/mainboard/emulation/qemu-q35/romstage.c
@@ -21,7 +21,6 @@
 #include <pc80/mc146818rtc.h>
 #include <console/console.h>
 #include <southbridge/intel/i82801ix/i82801ix.h>
-#include <cpu/x86/bist.h>
 #include <timestamp.h>
 #include "drivers/pc80/udelay_io.c"
 #include <delay.h>
@@ -40,9 +39,6 @@ void main(unsigned long bist)
 	i82801ix_early_init();
 	console_init();
 
-	/* Halt if there was a built in self test failure */
-	report_bist_failure(bist);
-
 	//print_pci_devices();
 	//dump_pci_devices();