diff options
| author | Yu-Ping Wu <yupingso@chromium.org> | 2020-01-15 16:47:37 +0800 |
|---|---|---|
| committer | Commit Bot <commit-bot@chromium.org> | 2020-02-03 13:31:10 +0000 |
| commit | 371d33783f3304732135e069d0c91b398c5375d4 (patch) | |
| tree | c65e46c35d8c7aecac20c52984d6556b3d7dcab6 | |
| parent | 6208b9aa9c4e8b7c9ff8063965c9f9aa519c1740 (diff) | |
| download | vboot-371d33783f3304732135e069d0c91b398c5375d4.tar.gz | |
vboot: Convert UI errors to vboot2-style
Error codes are renamed as follows:
VBERROR_INVALID_SCREEN_INDEX
--> VB2_ERROR_UI_INVALID_SCREEN
VBERROR_SCREEN_DRAW
--> VB2_ERROR_UI_DRAW_FAILURE
In addition, add new error code VB2_ERROR_UI_DISPLAY_INIT.
BRANCH=none
BUG=none
TEST=emerge-nami depthcharge
Cq-Depend: chromium:2002310
Change-Id: I1381762fbe1a9bb0c76e7e7d64a0732799c3bf0f
Signed-off-by: Yu-Ping Wu <yupingso@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/vboot_reference/+/2002309
Reviewed-by: Joel Kitching <kitching@chromium.org>
| -rw-r--r-- | firmware/2lib/include/2return_codes.h | 19 |
1 files changed, 15 insertions, 4 deletions
diff --git a/firmware/2lib/include/2return_codes.h b/firmware/2lib/include/2return_codes.h index fa6bf68a..0394feed 100644 --- a/firmware/2lib/include/2return_codes.h +++ b/firmware/2lib/include/2return_codes.h @@ -71,8 +71,6 @@ enum vb2_return_code { VBERROR_SHUTDOWN_REQUESTED = 0x1000D, /* Invalid bitmap volume */ VBERROR_INVALID_BMPFV = 0x10014, - /* Invalid screen index */ - VBERROR_INVALID_SCREEN_INDEX = 0x10015, /* 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 */ @@ -81,8 +79,6 @@ enum vb2_return_code { VBERROR_EC_REBOOT_TO_RO_REQUIRED = 0x10022, /* No image present */ VBERROR_NO_IMAGE_PRESENT = 0x10026, - /* failed to draw screen */ - VBERROR_SCREEN_DRAW = 0x10027, /* Error reading FWMP from TPM (note: not present is not an error) */ VBERROR_TPM_READ_FWMP = 0x10029, /* Peripheral busy. Cannot upgrade firmware at present. */ @@ -763,6 +759,21 @@ enum vb2_return_code { VB2_ERROR_LK_NO_DISK_FOUND = 0x100b3000, /********************************************************************** + * UI errors + */ + VB2_ERROR_UI = 0x100c0000, + + /* Display initialization failed */ + VB2_ERROR_UI_DISPLAY_INIT = 0x100c1000, + + /* Problem finding screen entry or its draw function */ + VB2_ERROR_UI_INVALID_SCREEN = 0x100c2000, + + /* Screen drawing failed, including all CBGFX_ERROR_* errors returned + from libpayload */ + VB2_ERROR_UI_DRAW_FAILURE = 0x100c3000, + + /********************************************************************** * Errors generated by host library (non-firmware) start here. */ VB2_ERROR_HOST_BASE = 0x20000000, |