summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authoredisonhello <edisonhello@google.com>2021-09-07 15:07:56 +0800
committerCommit Bot <commit-bot@chromium.org>2021-12-08 21:43:57 +0000
commiteba5595b348e4ff252cf2a64ea0105ee8014d2ed (patch)
tree4c6da4b65f2975cf9396ae21cadc02d5715314e2
parente9176ffaffd275be898bdcd816c68d77698d3e4a (diff)
downloadvboot-eba5595b348e4ff252cf2a64ea0105ee8014d2ed.tar.gz
vboot: Remove vb2_screen and vb2_ui_error enums
Since all the functions that use these two enums are already removed, these enums can be deleted as well. BUG=b:172339016 TEST=DEBUG=1 make -j test_setup && make -j runtests BRANCH=none Cq-Depend: chromium:3142709 Signed-off-by: edisonhello <edisonhello@google.com> Change-Id: I1de42569e0f030b612ec3c6d00575a7efdcfdab9 Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/vboot_reference/+/3144447 Reviewed-by: Yu-Ping Wu <yupingso@chromium.org>
-rw-r--r--firmware/2lib/include/2api.h77
1 files changed, 0 insertions, 77 deletions
diff --git a/firmware/2lib/include/2api.h b/firmware/2lib/include/2api.h
index e59f1d30..67b8dfac 100644
--- a/firmware/2lib/include/2api.h
+++ b/firmware/2lib/include/2api.h
@@ -1446,83 +1446,6 @@ vb2_error_t vb2ex_diagnostic_ui(struct vb2_context *ctx);
#define VB2_CLR_BIT(mask, index) ((mask) &= ~((uint32_t)1 << (index)))
#define VB2_GET_BIT(mask, index) ((mask) & ((uint32_t)1 << (index)))
-/* Screens. */
-enum vb2_screen {
- /* Wait screen for EC sync and AUXFW sync */
- VB2_SCREEN_FIRMWARE_SYNC = 0x100,
- /* Broken screen */
- VB2_SCREEN_RECOVERY_BROKEN = 0x110,
- /* Advanced options */
- VB2_SCREEN_ADVANCED_OPTIONS = 0x120,
- /* Language selection screen */
- VB2_SCREEN_LANGUAGE_SELECT = 0x130,
- /* Debug info */
- VB2_SCREEN_DEBUG_INFO = 0x140,
- /* Firmware log */
- VB2_SCREEN_FIRMWARE_LOG = 0x150,
- /* First recovery screen to select recovering from disk or phone */
- VB2_SCREEN_RECOVERY_SELECT = 0x200,
- /* Invalid recovery media inserted */
- VB2_SCREEN_RECOVERY_INVALID = 0x201,
- /* Confirm transition to developer mode */
- VB2_SCREEN_RECOVERY_TO_DEV = 0x202,
- /* Recovery using phone */
- VB2_SCREEN_RECOVERY_PHONE_STEP1 = 0x210,
- VB2_SCREEN_RECOVERY_PHONE_STEP2 = 0x211,
- /* Recovery using disk */
- VB2_SCREEN_RECOVERY_DISK_STEP1 = 0x220,
- VB2_SCREEN_RECOVERY_DISK_STEP2 = 0x221,
- VB2_SCREEN_RECOVERY_DISK_STEP3 = 0x222,
- /* Developer mode screen */
- VB2_SCREEN_DEVELOPER_MODE = 0x300,
- /* Confirm transition to normal mode */
- VB2_SCREEN_DEVELOPER_TO_NORM = 0x310,
- /* Developer boot from external disk */
- VB2_SCREEN_DEVELOPER_BOOT_EXTERNAL = 0x320,
- /* Invalid external disk inserted */
- VB2_SCREEN_DEVELOPER_INVALID_DISK = 0x330,
- /* Select alternate bootloader ("altfw") */
- VB2_SCREEN_DEVELOPER_SELECT_ALTFW = 0x340,
- /* Diagnostic tools */
- VB2_SCREEN_DIAGNOSTICS = 0x400,
- /* Storage diagnostic screen */
- VB2_SCREEN_DIAGNOSTICS_STORAGE_HEALTH = 0x410,
- VB2_SCREEN_DIAGNOSTICS_STORAGE_TEST_SHORT = 0x411,
- VB2_SCREEN_DIAGNOSTICS_STORAGE_TEST_EXTENDED = 0x412,
- /* Memory diagnostic screens */
- VB2_SCREEN_DIAGNOSTICS_MEMORY_QUICK = 0x420,
- VB2_SCREEN_DIAGNOSTICS_MEMORY_FULL = 0x421,
-};
-
-enum vb2_ui_error {
- /* No error */
- VB2_UI_ERROR_NONE = 0,
- /* MiniOS boot failed */
- VB2_UI_ERROR_MINIOS_BOOT_FAILED,
- /* Dev mode already enabled */
- VB2_UI_ERROR_DEV_MODE_ALREADY_ENABLED,
- /* Untrusted confirmation */
- VB2_UI_ERROR_UNTRUSTED_CONFIRMATION,
- /* To-norm not allowed */
- VB2_UI_ERROR_TO_NORM_NOT_ALLOWED,
- /* Internal boot failed */
- VB2_UI_ERROR_INTERNAL_BOOT_FAILED,
- /* External boot is disabled */
- VB2_UI_ERROR_EXTERNAL_BOOT_DISABLED,
- /* Alternate bootloader is disabled */
- VB2_UI_ERROR_ALTFW_DISABLED,
- /* No alternate bootloader was found */
- VB2_UI_ERROR_ALTFW_EMPTY,
- /* Alternate bootloader failed */
- VB2_UI_ERROR_ALTFW_FAILED,
- /* Debug info screen initialization failed */
- VB2_UI_ERROR_DEBUG_LOG,
- /* Firmware log screen initialization failed */
- VB2_UI_ERROR_FIRMWARE_LOG,
- /* Diagnostics internal failure */
- VB2_UI_ERROR_DIAGNOSTICS,
-};
-
/**
* Check that physical presence button is currently pressed by the user.
*