diff options
| author | Joel Kitching <kitching@google.com> | 2019-07-30 10:36:00 +0800 |
|---|---|---|
| committer | Commit Bot <commit-bot@chromium.org> | 2019-12-06 21:19:39 +0000 |
| commit | 99b15d64f9b15a487fd871fcd527d00c3641509c (patch) | |
| tree | f0cac760286479da29e7e736ec8315fb9766cf5e /firmware/lib/vboot_ui_menu.c | |
| parent | 16e6fe39f94e802cadcd67ae0ac612aa6ec1ee7f (diff) | |
| download | vboot-99b15d64f9b15a487fd871fcd527d00c3641509c.tar.gz | |
vboot: convert LoadKernel and TryLoadKernel to vboot2-style errors
Convert LoadKernel and TryLoadKernel to use vboot2-style error
codes. Error codes are renamed as follows:
VBERROR_NO_KERNEL_FOUND
--> VB2_ERROR_LK_NO_KERNEL_FOUND
VBERROR_INVALID_KERNEL_FOUND
--> VB2_ERROR_LK_INVALID_KERNEL_FOUND
VBERROR_NO_DISK_FOUND
--> VB2_ERROR_LK_NO_DISK_FOUND
Remove these error codes:
VBERROR_LOAD_KERNEL_RECOVERY
Remove VBSD_BOOT_DEV_SWITCH_ON check in vb2_developer_ui
to align vboot_ui and vboot_ui_menu functionality.
VBERROR_LOAD_KERNEL
Unused.
BUG=b:124141368, chromium:988410
TEST=make clean && make runtests
BRANCH=none
Change-Id: I90389c6629cc6055c4a4acbbbdd358bb79b63bf7
Signed-off-by: Joel Kitching <kitching@google.com>
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/vboot_reference/+/1728297
Tested-by: Joel Kitching <kitching@chromium.org>
Commit-Queue: Joel Kitching <kitching@chromium.org>
Reviewed-by: Joel Kitching <kitching@chromium.org>
Diffstat (limited to 'firmware/lib/vboot_ui_menu.c')
| -rw-r--r-- | firmware/lib/vboot_ui_menu.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/firmware/lib/vboot_ui_menu.c b/firmware/lib/vboot_ui_menu.c index 08da08cb..f07a814e 100644 --- a/firmware/lib/vboot_ui_menu.c +++ b/firmware/lib/vboot_ui_menu.c @@ -887,9 +887,9 @@ static vb2_error_t recovery_ui(struct vb2_context *ctx) if (VB2_SUCCESS == ret) return ret; /* Found a recovery kernel */ - if (usb_nogood != (ret != VBERROR_NO_DISK_FOUND)) { + if (usb_nogood != (ret != VB2_ERROR_LK_NO_DISK_FOUND)) { /* USB state changed, force back to base screen */ - usb_nogood = ret != VBERROR_NO_DISK_FOUND; + usb_nogood = ret != VB2_ERROR_LK_NO_DISK_FOUND; enter_recovery_base_screen(ctx); } |