diff options
| author | Shelley Chen <shchen@chromium.org> | 2017-09-13 10:44:06 -0700 |
|---|---|---|
| committer | chrome-bot <chrome-bot@chromium.org> | 2017-09-15 16:59:22 -0700 |
| commit | 1a8b1c008e9cbb08282a17318a82d1df88807022 (patch) | |
| tree | 3849393fd2e4c7f5694d86409099f3356045869b | |
| parent | 1282081609321888f485318cc7d06ee047feb31e (diff) | |
| download | vboot-1a8b1c008e9cbb08282a17318a82d1df88807022.tar.gz | |
detachables: Set TO_DEV menu's default selection to cancel
BUG=b:65546569
BRANCH=None
TEST=Boot into recovery, selection Disabled OS Verification.
Ensure that in next menu, Cancel is selected.
Also, setting default for TO_NORM menu to Confirm.
Change-Id: Ibf72ec15aa38b1b815be97a08cfe7c9ee2615390
Signed-off-by: Shelley Chen <shchen@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/665356
Reviewed-by: Julius Werner <jwerner@chromium.org>
| -rw-r--r-- | firmware/lib/vboot_ui_menu.c | 17 |
1 files changed, 10 insertions, 7 deletions
diff --git a/firmware/lib/vboot_ui_menu.c b/firmware/lib/vboot_ui_menu.c index 84ced164..746bfe13 100644 --- a/firmware/lib/vboot_ui_menu.c +++ b/firmware/lib/vboot_ui_menu.c @@ -440,10 +440,10 @@ VbError_t vb2_update_menu(struct vb2_context *ctx) case VB_WARN_ENABLE_VER: /* * 1. Enable boot verification - * 2. Default to the power off option + * 2. Default to the confirm option */ vb2_set_menu_items(VB_MENU_TO_NORM, - VB_TO_NORM_POWER_OFF); + VB_TO_NORM_CONFIRM); break; case VB_WARN_POWER_OFF: /* Power off machine */ @@ -531,10 +531,10 @@ VbError_t vb2_update_menu(struct vb2_context *ctx) case VB_RECOVERY_TO_DEV: /* * 1. Switch to TO_DEV menu - * 2. Default to power off option + * 2. Default to cancel option */ vb2_set_menu_items(VB_MENU_TO_DEV, - VB_TO_DEV_POWER_OFF); + VB_TO_DEV_CANCEL); break; case VB_RECOVERY_DBG_INFO: break; @@ -579,7 +579,10 @@ VbError_t vb2_update_menu(struct vb2_context *ctx) */ current_menu = prev_menu; prev_menu = VB_MENU_LANGUAGES; - /* default to power off index */ + /* + * default to power off index with the exception of + * TO_DEV and TO_NORM menus + */ switch (current_menu) { case VB_MENU_DEV_WARNING: current_menu_idx = VB_WARN_POWER_OFF; @@ -588,13 +591,13 @@ VbError_t vb2_update_menu(struct vb2_context *ctx) current_menu_idx = VB_DEV_POWER_OFF; break; case VB_MENU_TO_NORM: - current_menu_idx = VB_TO_NORM_POWER_OFF; + current_menu_idx = VB_TO_NORM_CONFIRM; break; case VB_MENU_RECOVERY: current_menu_idx = VB_RECOVERY_POWER_OFF; break; case VB_MENU_TO_DEV: - current_menu_idx = VB_TO_DEV_POWER_OFF; + current_menu_idx = VB_TO_DEV_CANCEL; break; default: current_menu_idx = 0; |