Duncan Laurie has submitted this change and it was merged. ( https://review.coreboot.org/c/coreboot/+/32906 )
Change subject: vboot: determine display init before recovery check ......................................................................
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 --- M src/security/vboot/vboot_logic.c 1 file changed, 8 insertions(+), 8 deletions(-)
Approvals: build bot (Jenkins): Verified Duncan Laurie: Looks good to me, approved Furquan Shaikh: Looks good to me, approved
diff --git a/src/security/vboot/vboot_logic.c b/src/security/vboot/vboot_logic.c index 00347c3..d4ad327 100644 --- a/src/security/vboot/vboot_logic.c +++ b/src/security/vboot/vboot_logic.c @@ -344,6 +344,14 @@ 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 @@ 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);