vboot: Reduce unnecessary redraw of error message
When developer mode is disabled by the VB2_SECDATA_FWMP_DEV_DISABLE_BOOT
flag, the error message will be redrawn per 20 ms even if no key is
pressed. This patch reduces unnecessary redraw by moving the drawing
inside enter_to_norm_menu(), which will be called only when changing
screens.
BRANCH=kukui
BUG=chromium:1048094,chromium:1049029
TEST=emerge-nami vboot_reference
Cq-Depend: chromium:2040844
Change-Id: I0e892086b25fc94800534c5a37bcab8b70a5fcd9
Signed-off-by: Yu-Ping Wu <yupingso@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/vboot_reference/+/2035056
Reviewed-by: Joel Kitching <kitching@chromium.org>
Reviewed-by: Julius Werner <jwerner@chromium.org>
(cherry picked from commit 87c7b1b55155a91cd22a1e93343064d65d6aad97)
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/vboot_reference/+/2043781
diff --git a/firmware/lib/vboot_ui_menu.c b/firmware/lib/vboot_ui_menu.c
index b932ce9..567742b 100644
--- a/firmware/lib/vboot_ui_menu.c
+++ b/firmware/lib/vboot_ui_menu.c
@@ -275,6 +275,9 @@
{
vb2_change_menu(VB_MENU_TO_NORM, VB_TO_NORM_CONFIRM);
vb2_draw_current_screen(ctx);
+ /* Make sure user knows dev mode disabled */
+ if (disable_dev_boot)
+ VbExDisplayDebugInfo(dev_disable_msg, 0);
return VBERROR_KEEP_LOOPING;
}
@@ -772,10 +775,6 @@
do {
uint32_t key = VbExKeyboardRead();
- /* Make sure user knows dev mode disabled */
- if (disable_dev_boot)
- VbExDisplayDebugInfo(dev_disable_msg, 0);
-
switch (key) {
case VB_BUTTON_VOL_DOWN_LONG_PRESS:
case VB_KEY_CTRL('D'):
