From 7097e55a8d932d43f6bee6a3c538d21b9370dad5 Mon Sep 17 00:00:00 2001 From: Julius Werner Date: Wed, 24 Jan 2018 19:34:50 -0800 Subject: [PATCH] detachables: Remove obsolete RECOVERY menu This patch removes the RECOVERY menu that is no longer being used. BRANCH=None BUG=None TEST=make runtests Change-Id: I069101ab1418779e2cc4a9f6d1b39166ba2b37ed Signed-off-by: Julius Werner Reviewed-on: https://chromium-review.googlesource.com/888080 Reviewed-by: Randall Spangler Reviewed-by: Furquan Shaikh --- firmware/include/vboot_api.h | 3 +- firmware/lib/include/vboot_ui_menu_private.h | 9 ---- firmware/lib/vboot_ui_menu.c | 43 -------------------- 3 files changed, 1 insertion(+), 54 deletions(-) diff --git a/firmware/include/vboot_api.h b/firmware/include/vboot_api.h index ba545d7ee2..91a2690cbb 100644 --- a/firmware/include/vboot_api.h +++ b/firmware/include/vboot_api.h @@ -757,8 +757,7 @@ enum VbScreenType_t { VB_SCREEN_DEVELOPER_WARNING_MENU = 0x20a, /* Detachable Menu - Developer Boot */ VB_SCREEN_DEVELOPER_MENU = 0x20b, - /* Detachable Menu - Recovery */ - VB_SCREEN_RECOVERY_MENU = 0x20c, + /* REMOVED: Detachable Menu - Recovery (0x20c) */ /* Detachable Menu - Confirm Dev Mode */ VB_SCREEN_RECOVERY_TO_DEV_MENU = 0x20d, /* Detachable Menu - Confirm Normal Mode */ diff --git a/firmware/lib/include/vboot_ui_menu_private.h b/firmware/lib/include/vboot_ui_menu_private.h index c3007497ae..72caffc753 100644 --- a/firmware/lib/include/vboot_ui_menu_private.h +++ b/firmware/lib/include/vboot_ui_menu_private.h @@ -12,7 +12,6 @@ typedef enum _VB_MENU { VB_MENU_DEV_WARNING, VB_MENU_DEV, VB_MENU_TO_NORM, - VB_MENU_RECOVERY, VB_MENU_TO_DEV, VB_MENU_LANGUAGES, VB_MENU_OPTIONS, @@ -51,14 +50,6 @@ typedef enum _VB_TO_NORM_MENU { VB_TO_NORM_COUNT, } VB_TO_NORM_MENU; -typedef enum _VB_RECOVERY_MENU { - VB_RECOVERY_TO_DEV, - VB_RECOVERY_DBG_INFO, - VB_RECOVERY_POWER_OFF, - VB_RECOVERY_LANGUAGE, - VB_RECOVERY_COUNT, -} VB_RECOVERY_MENU; - typedef enum _VB_TO_DEV_MENU { VB_TO_DEV_CONFIRM, VB_TO_DEV_CANCEL, diff --git a/firmware/lib/vboot_ui_menu.c b/firmware/lib/vboot_ui_menu.c index cca6ed474e..5f3ae3d099 100644 --- a/firmware/lib/vboot_ui_menu.c +++ b/firmware/lib/vboot_ui_menu.c @@ -125,13 +125,6 @@ static char *to_normal_menu[] = { "Language\n" }; -static char *recovery_menu[] = { - "Enable developer mode\n", - "Show Debug Info\n", - "Power Off\n", - "Language\n" -}; - static char *to_dev_menu[] = { "Confirm enabling developer mode\n", "Cancel\n", @@ -192,10 +185,6 @@ static void vb2_get_current_menu_size(VB_MENU menu, char ***menu_array, *size = VB_TO_NORM_COUNT; temp_menu = to_normal_menu; break; - case VB_MENU_RECOVERY: - *size = VB_RECOVERY_COUNT; - temp_menu = recovery_menu; - break; case VB_MENU_TO_DEV: *size = VB_TO_DEV_COUNT; temp_menu = to_dev_menu; @@ -258,7 +247,6 @@ static const uint32_t VB_MENU_TO_SCREEN_MAP[] = { VB_SCREEN_DEVELOPER_WARNING_MENU, VB_SCREEN_DEVELOPER_MENU, VB_SCREEN_DEVELOPER_TO_NORM_MENU, - VB_SCREEN_RECOVERY_MENU, VB_SCREEN_RECOVERY_TO_DEV_MENU, VB_SCREEN_LANGUAGES_MENU, VB_SCREEN_OPTIONS_MENU, @@ -433,29 +421,6 @@ static VbError_t vb2_update_menu(struct vb2_context *ctx) vb2_set_menu_items(VB_MENU_OPTIONS, VB_OPTIONS_CANCEL); break; - case VB_MENU_RECOVERY: - switch(current_menu_idx) { - case VB_RECOVERY_TO_DEV: - /* - * 1. Switch to TO_DEV menu - * 2. Default to cancel option - */ - vb2_set_menu_items(VB_MENU_TO_DEV, - VB_TO_DEV_CANCEL); - break; - case VB_RECOVERY_DBG_INFO: - break; - case VB_RECOVERY_POWER_OFF: - ret = VBERROR_SHUTDOWN_REQUESTED; - break; - case VB_RECOVERY_LANGUAGE: - vb2_set_menu_items(VB_MENU_LANGUAGES, loc); - break; - default: - /* Invalid menu item. Don't update anything */ - break; - } - break; case VB_MENU_TO_DEV: switch(current_menu_idx) { case VB_TO_DEV_CONFIRM: @@ -508,9 +473,6 @@ static VbError_t vb2_update_menu(struct vb2_context *ctx) case VB_MENU_TO_NORM: vb2_set_menu_items(prev_menu, VB_TO_NORM_CONFIRM); break; - case VB_MENU_RECOVERY: - vb2_set_menu_items(prev_menu, VB_RECOVERY_POWER_OFF); - break; case VB_MENU_TO_DEV: vb2_set_menu_items(prev_menu, VB_TO_DEV_CANCEL); break; @@ -556,12 +518,7 @@ static VbError_t vb2_update_locale(struct vb2_context *ctx) { * @return VBERROR_SUCCESS */ static VbError_t vb2_set_disabled_idx_mask(uint32_t flags) { - /* Disable "Enable Developer Mode" menu item */ disabled_idx_mask = 0; - if (current_menu == VB_MENU_RECOVERY && - (flags & VBSD_BOOT_DEV_SWITCH_ON)) { - disabled_idx_mask |= 1 << VB_RECOVERY_TO_DEV; - } /* Disable Network Boot Option */ if (current_menu == VB_MENU_DEV) disabled_idx_mask |= 1 << VB_DEV_NETWORK;