diff options
| author | Yu-Ping Wu <yupingso@chromium.org> | 2021-03-10 15:50:25 +0800 |
|---|---|---|
| committer | Commit Bot <commit-bot@chromium.org> | 2021-03-17 04:16:24 +0000 |
| commit | 6e4d58cb49da19ce15e17261cb1a5d4660d12de3 (patch) | |
| tree | ab196998331030c4875bf6e9e64f39170ea3d182 | |
| parent | d68fbe48267a96b1030b896a9ed771a31741be0c (diff) | |
| download | vboot-6e4d58cb49da19ce15e17261cb1a5d4660d12de3.tar.gz | |
vboot/ui: Reorder UI errors
Reorder errors in enum vb2_ui_error to match the order in bmpblk. Also
rename VB2_UI_ERROR_EXTERNAL_BOOT_NOT_ENABLED to
VB2_UI_ERROR_EXTERNAL_BOOT_DISABLED for consistency with
VB2_UI_ERROR_ALTFW_DISABLED.
BUG=b:144969091
TEST=make runtests
TEST=emerge-asurada depthcharge
BRANCH=none
Cq-Depend: chromium:2682057
Change-Id: Id8859be3e451c077dd7689b51e98a410d5987874
Signed-off-by: Yu-Ping Wu <yupingso@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/vboot_reference/+/2746898
Reviewed-by: Joel Kitching <kitching@chromium.org>
| -rw-r--r-- | firmware/2lib/2ui_screens.c | 2 | ||||
| -rw-r--r-- | firmware/2lib/include/2api.h | 16 |
2 files changed, 9 insertions, 9 deletions
diff --git a/firmware/2lib/2ui_screens.c b/firmware/2lib/2ui_screens.c index 218c34f9..44b85ea3 100644 --- a/firmware/2lib/2ui_screens.c +++ b/firmware/2lib/2ui_screens.c @@ -746,7 +746,7 @@ vb2_error_t vb2_ui_developer_mode_boot_external_action( !vb2_dev_boot_external_allowed(ui->ctx)) { VB2_DEBUG("ERROR: Dev mode external boot not allowed\n"); ui->error_beep = 1; - ui->error_code = VB2_UI_ERROR_EXTERNAL_BOOT_NOT_ENABLED; + ui->error_code = VB2_UI_ERROR_EXTERNAL_BOOT_DISABLED; return VB2_SUCCESS; } diff --git a/firmware/2lib/include/2api.h b/firmware/2lib/include/2api.h index 8821ff94..255e2b45 100644 --- a/firmware/2lib/include/2api.h +++ b/firmware/2lib/include/2api.h @@ -1355,22 +1355,22 @@ enum vb2_ui_error { VB2_UI_ERROR_NONE = 0, /* Dev mode already enabled */ VB2_UI_ERROR_DEV_MODE_ALREADY_ENABLED, - /* To-norm not allowed */ - VB2_UI_ERROR_TO_NORM_NOT_ALLOWED, - /* Debug info screen initialization failed */ - VB2_UI_ERROR_DEBUG_LOG, - /* External boot not enabled */ - VB2_UI_ERROR_EXTERNAL_BOOT_NOT_ENABLED, - /* Firmware log screen initialization failed */ - VB2_UI_ERROR_FIRMWARE_LOG, /* Untrusted confirmation */ VB2_UI_ERROR_UNTRUSTED_CONFIRMATION, + /* To-norm not allowed */ + VB2_UI_ERROR_TO_NORM_NOT_ALLOWED, + /* 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, }; |