Revert "vboot: Add screen types for upcoming UI revamp"
This reverts commit 1df08718b7c18a0454240f78bdb80359116fc295.
CL:1968268 added screen types to enum VbScreenType_t for menu UI, but we
later decided to create a separate enum for that as part of vboot2 APIs.
Hence, remove these screen types that are not used in legacy UIs.
BRANCH=none
BUG=b:146399181
TEST=emerge-nami vboot_reference
Change-Id: Id86fcac257894148c82d54d27a8720ecb6b23af6
Signed-off-by: Yu-Ping Wu <yupingso@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/vboot_reference/+/2089049
Reviewed-by: Joel Kitching <kitching@chromium.org>
diff --git a/firmware/include/vboot_api.h b/firmware/include/vboot_api.h
index 0ad7915..9d4bacb 100644
--- a/firmware/include/vboot_api.h
+++ b/firmware/include/vboot_api.h
@@ -388,28 +388,6 @@
VB_SCREEN_ALT_FW_PICK = 0x212,
/* Alt firmware menu screen (for detachable UI ) */
VB_SCREEN_ALT_FW_MENU = 0x213,
- /* Confirm after VB_SCREEN_RECOVERY_TO_DEV_MENU */
- VB_SCREEN_TO_DEV_CONFIRMED = 0x217,
- /* Hardware failure */
- VB_SCREEN_HARDWARE_FAILURE = 0x218,
- /* First recovery screen to select recovering from phone or disk */
- VB_SCREEN_RECOVERY_SELECT = 0x220,
- /* Recovery using phone */
- VB_SCREEN_RECOVERY_PHONE_STEP1 = 0x230,
- VB_SCREEN_RECOVERY_PHONE_STEP2 = 0x231,
- VB_SCREEN_RECOVERY_PHONE_STEP3 = 0x232,
- /* Recovery using external disk */
- VB_SCREEN_RECOVERY_DISK_STEP1 = 0x240,
- VB_SCREEN_RECOVERY_DISK_STEP2 = 0x241,
- VB_SCREEN_RECOVERY_DISK_STEP3 = 0x242,
- /* Boot from internal disk */
- VB_SCREEN_BOOT_FROM_INTERNAL = 0x250,
- /* Boot from external disk */
- VB_SCREEN_BOOT_FROM_EXTERNAL = 0x251,
- /* Debug info screen */
- VB_SCREEN_DEBUG_INFO = 0x252,
- /* BIOS log screen */
- VB_SCREEN_BIOS_LOG = 0x253,
/* 0x300-0x350 reserved for device-specific screens */
/* Vendor data not set warning screen */
VB_COMPLETE_VENDOR_DATA = 0x300,