summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-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);