vboot: Convert more UI errors to vboot2-style
Error codes are renamed as follows:
VBERROR_INVALID_BMPFV
--> VB2_ERROR_UI_INVALID_ARCHIVE
VBERROR_NO_IMAGE_PRESENT
--> VB2_ERROR_UI_MISSING_IMAGE
Also remove unnecessary paddings 0x1000 for UI errors.
BRANCH=none
BUG=b:124141368, chromium:988410
TEST=emerge-nami depthcharge
Cq-Depend: chromium:2082833
Change-Id: I8b7743d9ceecde6c9e3e88109422a99594ad6aab
Signed-off-by: Yu-Ping Wu <yupingso@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/vboot_reference/+/2082759
Reviewed-by: Joel Kitching <kitching@chromium.org>
diff --git a/firmware/2lib/include/2return_codes.h b/firmware/2lib/include/2return_codes.h
index 64b375d..9f42205 100644
--- a/firmware/2lib/include/2return_codes.h
+++ b/firmware/2lib/include/2return_codes.h
@@ -69,16 +69,12 @@
VBERROR_TPM_LOCK_KERNEL = 0x1000C,
/* Calling firmware requested shutdown via VbExIsShutdownRequested() */
VBERROR_SHUTDOWN_REQUESTED = 0x1000D,
- /* Invalid bitmap volume */
- VBERROR_INVALID_BMPFV = 0x10014,
/* VbExBeep() can't make sound in the background */
VBERROR_NO_BACKGROUND_SOUND = 0x10019,
/* Need EC to reboot to read-only code to switch RW slot */
VBERROR_EC_REBOOT_TO_SWITCH_RW = 0x1001A,
/* Need EC to reboot to read-only code */
VBERROR_EC_REBOOT_TO_RO_REQUIRED = 0x10022,
- /* No image present */
- VBERROR_NO_IMAGE_PRESENT = 0x10026,
/* Error reading FWMP from TPM (note: not present is not an error) */
VBERROR_TPM_READ_FWMP = 0x10029,
/* Peripheral busy. Cannot upgrade firmware at present. */
@@ -765,14 +761,20 @@
VB2_ERROR_UI = 0x100c0000,
/* Display initialization failed */
- VB2_ERROR_UI_DISPLAY_INIT = 0x100c1000,
+ VB2_ERROR_UI_DISPLAY_INIT = 0x100c0001,
/* Problem finding screen entry or its draw function */
- VB2_ERROR_UI_INVALID_SCREEN = 0x100c2000,
+ VB2_ERROR_UI_INVALID_SCREEN = 0x100c0002,
/* Screen drawing failed, including all CBGFX_ERROR_* errors returned
from libpayload */
- VB2_ERROR_UI_DRAW_FAILURE = 0x100c3000,
+ VB2_ERROR_UI_DRAW_FAILURE = 0x100c0003,
+
+ /* Problem loading archive from CBFS */
+ VB2_ERROR_UI_INVALID_ARCHIVE = 0x100c0004,
+
+ /* Image not found in the archive */
+ VB2_ERROR_UI_MISSING_IMAGE = 0x100c0005,
/**********************************************************************
* Errors generated by host library (non-firmware) start here.
