summaryrefslogtreecommitdiff
path: root/src/security
diff options
context:
space:
mode:
authorEric Lai <ericr_lai@compal.corp-partner.google.com>2019-05-21 16:55:14 +0800
committerDuncan Laurie <dlaurie@chromium.org>2019-05-22 02:54:27 +0000
commitb6ee05692dce5df945b8363d361398ab2192d960 (patch)
tree7c66e331974115697d77c21539fba88f365704ad /src/security
parentbe291e8abf173e4f12e6d9e5532fdf1acbcb9a67 (diff)
downloadcoreboot-b6ee05692dce5df945b8363d361398ab2192d960.tar.xz
vboot: determine display init before recovery check
Display is required by recovery mode. Determine display init before recovery check. BUG=b:133197727,b:133175864 TEST=enter recovery mode, checked the display shows up Signed-off-by: Eric Lai <ericr_lai@compal.corp-partner.google.com> Change-Id: Id6ac611f51241373bca3e2b394a94dcd52d3fde7 Reviewed-on: https://review.coreboot.org/c/coreboot/+/32906 Tested-by: build bot (Jenkins) <no-reply@coreboot.org> Reviewed-by: Furquan Shaikh <furquan@google.com> Reviewed-by: Duncan Laurie <dlaurie@chromium.org>
Diffstat (limited to 'src/security')
-rw-r--r--src/security/vboot/vboot_logic.c16
1 files changed, 8 insertions, 8 deletions
diff --git a/src/security/vboot/vboot_logic.c b/src/security/vboot/vboot_logic.c
index 00347c3f58..d4ad32736b 100644
--- a/src/security/vboot/vboot_logic.c
+++ b/src/security/vboot/vboot_logic.c
@@ -344,6 +344,14 @@ void verstage_main(void)
printk(BIOS_INFO, "Phase 1\n");
rv = vb2api_fw_phase1(&ctx);
+ /* Jot down some information from vboot which may be required later on
+ in coreboot boot flow. */
+ if (ctx.flags & VB2_CONTEXT_DISPLAY_INIT)
+ /* Mainboard/SoC should initialize display. */
+ vboot_get_working_data()->flags |= VBOOT_WD_FLAG_DISPLAY_INIT;
+ if (ctx.flags & VB2_CONTEXT_DEVELOPER_MODE)
+ vboot_get_working_data()->flags |= VBOOT_WD_FLAG_DEVELOPER_MODE;
+
if (rv) {
/*
* If vb2api_fw_phase1 fails, check for return value.
@@ -364,14 +372,6 @@ void verstage_main(void)
vboot_reboot();
}
- /* Jot down some information from vboot which may be required later on
- in coreboot boot flow. */
- if (ctx.flags & VB2_CONTEXT_DISPLAY_INIT)
- /* Mainboard/SoC should initialize display. */
- vboot_get_working_data()->flags |= VBOOT_WD_FLAG_DISPLAY_INIT;
- if (ctx.flags & VB2_CONTEXT_DEVELOPER_MODE)
- vboot_get_working_data()->flags |= VBOOT_WD_FLAG_DEVELOPER_MODE;
-
/* Determine which firmware slot to boot (based on NVRAM) */
printk(BIOS_INFO, "Phase 2\n");
rv = vb2api_fw_phase2(&ctx);