diff options
| author | Shelley Chen <shchen@chromium.org> | 2016-12-28 14:29:43 -0800 |
|---|---|---|
| committer | chrome-bot <chrome-bot@chromium.org> | 2017-01-18 19:17:56 -0800 |
| commit | 1ceb361d6059a8222d663e7e3bb975de9bf856fa (patch) | |
| tree | 28e8be1d2b4d9482b7578c7d178ab234fc8d7030 | |
| parent | 9f1d423890e5c318d8dc0f465b4dee2c73d3d3e4 (diff) | |
| download | vboot-1ceb361d6059a8222d663e7e3bb975de9bf856fa.tar.gz | |
firmware: fixing menu artifacts during printing
BUG=chrome-os-partner:61275
BRANCH=None
TEST=reboot and switch menus and make sure everything
is printing out properly.
Change-Id: I1269d3dc762a66dde0203673b7b400aba92afa75
Signed-off-by: Shelley Chen <shchen@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/424356
Reviewed-by: Randall Spangler <rspangler@chromium.org>
| -rw-r--r-- | firmware/lib/vboot_ui_menu.c | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/firmware/lib/vboot_ui_menu.c b/firmware/lib/vboot_ui_menu.c index be4b8376..1256e2ed 100644 --- a/firmware/lib/vboot_ui_menu.c +++ b/firmware/lib/vboot_ui_menu.c @@ -235,7 +235,7 @@ static char *dev_warning_menu[] = { }; static char *dev_menu[] = { - "Boot Network Image\n", + "Boot Network Image (not working yet)\n", "Boot Legacy BIOS\n", "Boot USB Image\n", "Boot Developer Image\n", @@ -643,7 +643,6 @@ VbError_t vb2_developer_menu(struct vb2_context *ctx, VbCommonParams *cparams) vb2_get_current_menu_size(current_menu, NULL, &menu_size); current_menu_idx = (current_menu_idx+1) % menu_size; - VbDisplayScreen(ctx, cparams, VB_SCREEN_DEVELOPER_WARNING, 0); vb2_print_current_menu(); break; case VB_KEY_RIGHT: @@ -902,6 +901,14 @@ VbError_t vb2_recovery_menu(struct vb2_context *ctx, VbCommonParams *cparams) ret = vb2_update_menu(); if (current_menu != VB_MENU_RECOVERY || current_menu_idx != VB_RECOVERY_DBG_INFO) { + // unfortunately we need this screen + // blanking to clear previous menus + // printed. + VbDisplayScreen(ctx, cparams, VB_SCREEN_BLANK, 0); + VbDisplayScreen(ctx, cparams, VBERROR_NO_DISK_FOUND == retval ? + VB_SCREEN_RECOVERY_INSERT : + VB_SCREEN_RECOVERY_NO_GOOD, + 0); vb2_print_current_menu(); } |