diff options
author | Pranay Shoroff <pshoroff@google.com> | 2019-12-12 13:38:04 -0700 |
---|---|---|
committer | Pranay Shoroff <pshoroff@google.com> | 2020-02-10 23:07:52 +0000 |
commit | d4a006922bf468be9f9f4446f3fefb2c8a3b7266 (patch) | |
tree | 95cda78fdc83528ebc0910674da7e380caab9e1b /firmware/include/vboot_api.h | |
parent | 87c7b1b55155a91cd22a1e93343064d65d6aad97 (diff) | |
download | vboot-d4a006922bf468be9f9f4446f3fefb2c8a3b7266.tar.gz |
vboot: modify control flow for vendor data config
Modify logic for new vendor data configuration workflow.
Current workflow contains little to no instruction for
navigating vendor data workflow. UI is generally very scarce.
New workflow aims to provide more instruction on how to proceed to
next steps, escape from the workflow and boot normally, and
a new YES/NO selection screen during the final confirmation
phase of the workflow.
BUG=b:138812835
BRANCH=none
TEST=emerge-sarien depthcharge, chromeos-bootimage, flash firmware image
on Sarien
and test workflow
Cq-Depend: chromium:1925665, chrome-internal:2180149
Change-Id: I3d7081f348a7dd68d10d1eba4879a359ccbdd6e5
Signed-off-by: Pranay Shoroff <pshoroff@google.com>
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/vboot_reference/+/1926508
Commit-Queue: Mathew King <mathewk@chromium.org>
Tested-by: Mathew King <mathewk@chromium.org>
Reviewed-by: Mathew King <mathewk@chromium.org>
Diffstat (limited to 'firmware/include/vboot_api.h')
-rw-r--r-- | firmware/include/vboot_api.h | 17 |
1 files changed, 11 insertions, 6 deletions
diff --git a/firmware/include/vboot_api.h b/firmware/include/vboot_api.h index d7c2eee2..7fc79396 100644 --- a/firmware/include/vboot_api.h +++ b/firmware/include/vboot_api.h @@ -402,12 +402,6 @@ enum VbScreenType_t { VB_SCREEN_ALT_FW_PICK = 0x212, /* Alt firmware menu screen (for detachable UI ) */ VB_SCREEN_ALT_FW_MENU = 0x213, - /* Set vendor data menu screen */ - VB_SCREEN_SET_VENDOR_DATA = 0x214, - /* Confirm vendor data menu screen */ - VB_SCREEN_CONFIRM_VENDOR_DATA = 0x215, - /* Confirm reboot for running diagnostics rom */ - VB_SCREEN_CONFIRM_DIAG = 0x216, /* Confirm after VB_SCREEN_RECOVERY_TO_DEV_MENU */ VB_SCREEN_TO_DEV_CONFIRMED = 0x217, /* Hardware failure */ @@ -430,6 +424,15 @@ enum VbScreenType_t { VB_SCREEN_DEBUG_INFO = 0x252, /* BIOS log screen */ VB_SCREEN_BIOS_LOG = 0x253, + /* 0x300-0x350 reserved for device-specific screens */ + /* Vendor data not set warning screen */ + VB_COMPLETE_VENDOR_DATA = 0x300, + /* Set vendor data menu screen */ + VB_SCREEN_SET_VENDOR_DATA = 0x301, + /* Confirm vendor data menu screen */ + VB_SCREEN_CONFIRM_VENDOR_DATA = 0x302, + /* Confirm reboot for running diagnostics rom */ + VB_SCREEN_CONFIRM_DIAG = 0x303, }; /** @@ -439,6 +442,8 @@ typedef struct VbVendorData { /* Current state of the the vendor data input */ const char *input_text; + /* Current confirmation selection for new vendor data */ + uint32_t selected_index; } VbVendorData; /** |