Patrick Georgi has submitted this change and it was merged. ( https://review.coreboot.org/c/coreboot/+/31349 )
Change subject: lib/bootblock: Sanitize CMOS after bootblock_*_early_init() ......................................................................
lib/bootblock: Sanitize CMOS after bootblock_*_early_init()
CMOS isn't used that early, but the chipset initialization may be required to access it.
In one instance, Intel Apollo Lake, the sanitize_cmos() function seems to hang if called before bootblock_soc_early_init(). The missing step is fast_spi_early_init(). But even without, one might expect sanitize_cmos() to return eventually (it didn't within about 20min).
Change-Id: I6e1a029e4be7e109be43a3dad944bd7e05ea1f02 Signed-off-by: Nico Huber nico.huber@secunet.com Reviewed-on: https://review.coreboot.org/c/coreboot/+/31349 Tested-by: build bot (Jenkins) no-reply@coreboot.org Reviewed-by: Alex Thiessen alex.thiessen.de+coreboot@gmail.com --- M src/lib/bootblock.c 1 file changed, 3 insertions(+), 3 deletions(-)
Approvals: build bot (Jenkins): Verified Alex Thiessen: Looks good to me, approved
diff --git a/src/lib/bootblock.c b/src/lib/bootblock.c index 43674ef..c28a67a 100644 --- a/src/lib/bootblock.c +++ b/src/lib/bootblock.c @@ -42,12 +42,12 @@ timestamps[i].entry_stamp); }
- sanitize_cmos(); - cmos_post_init(); - bootblock_soc_early_init(); bootblock_mainboard_early_init();
+ sanitize_cmos(); + cmos_post_init(); + if (CONFIG(BOOTBLOCK_CONSOLE)) { console_init(); exception_init();