summaryrefslogtreecommitdiff
path: root/src/lib/bootblock.c
diff options
context:
space:
mode:
authorNico Huber <nico.huber@secunet.com>2019-01-28 18:14:13 +0100
committerPatrick Georgi <pgeorgi@google.com>2019-05-23 08:47:59 +0000
commite0b9aea7be96f1d724a6c794dd617122125f1ba6 (patch)
tree37b6dd1e8935f6517503e1dbb885d66ab7cd001f /src/lib/bootblock.c
parenta5ea3a271bbaa10f03115ffe3f473a07ca95c5ab (diff)
downloadcoreboot-e0b9aea7be96f1d724a6c794dd617122125f1ba6.tar.xz
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>
Diffstat (limited to 'src/lib/bootblock.c')
-rw-r--r--src/lib/bootblock.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/lib/bootblock.c b/src/lib/bootblock.c
index 43674effc7..c28a67aceb 100644
--- a/src/lib/bootblock.c
+++ b/src/lib/bootblock.c
@@ -42,12 +42,12 @@ asmlinkage void bootblock_main_with_timestamp(uint64_t base_timestamp,
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();