diff options
| author | Joel Kitching <kitching@google.com> | 2019-05-10 12:17:18 +0800 |
|---|---|---|
| committer | chrome-bot <chrome-bot@chromium.org> | 2019-05-16 09:04:19 -0700 |
| commit | 43f6cab881dc0ed52fe08e6c2c64239fde11996b (patch) | |
| tree | b35951f4926755ca37ad5a55ffcdcc2b69fda519 /firmware/include/vboot_api.h | |
| parent | 8c857f466aecf70d788fc3937af0e881545ea989 (diff) | |
| download | vboot-43f6cab881dc0ed52fe08e6c2c64239fde11996b.tar.gz | |
vboot: update display init to use vboot2 code
As per go/vboot2-oprom-cleanup, use vboot2 SD flag
DISPLAY_AVAILABLE, instead of the old vboot1 flags
OPROM_MATTERS and OPROM_LOADED.
Remove instances of "OPROM" and update with correct
nomenclature.
Update code and tests for EC software sync and diagnostic
menu to use vboot2 display init model.
OPROM_MATTERS and OPROM_LOADED are now deprecated, and
will be removed when no references remain in depthcharge
and coreboot.
Deprecate VBERROR_DISPLAY_INIT_MISMATCH (previously
OPROM_MISMATCH) and return VBERROR_REBOOT_REQUIRED
directly when needed.
BUG=b:124141368, b:124192753, chromium:948529
TEST=Build image for eve, force EC update,
check that the "critical update" screen shows
TEST=make clean && make runtests
BRANCH=none
Change-Id: I889872f886230f8559d5cce09d0de194da3fcc38
Signed-off-by: Joel Kitching <kitching@google.com>
Reviewed-on: https://chromium-review.googlesource.com/1605641
Commit-Ready: ChromeOS CL Exonerator Bot <chromiumos-cl-exonerator@appspot.gserviceaccount.com>
Tested-by: Joel Kitching <kitching@chromium.org>
Reviewed-by: Julius Werner <jwerner@chromium.org>
Diffstat (limited to 'firmware/include/vboot_api.h')
| -rw-r--r-- | firmware/include/vboot_api.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/firmware/include/vboot_api.h b/firmware/include/vboot_api.h index c5b382ac..38c5cbda 100644 --- a/firmware/include/vboot_api.h +++ b/firmware/include/vboot_api.h @@ -118,8 +118,9 @@ enum VbErrorPredefined_t { VBERROR_EC_REBOOT_TO_SWITCH_RW = 0x1001A, /* Developer has requested a BIOS shell */ VBERROR_BIOS_SHELL_REQUESTED = 0x10020, - /* Need VGA and don't have it, or vice-versa */ - VBERROR_VGA_OPROM_MISMATCH = 0x10021, + /* Need initialized display and don't have it, or vice-versa. + Deprecated; should use VBERROR_REBOOT_REQUIRED instead. */ + VBERROR_DEPRECATED_DISPLAY_INIT_MISMATCH = 0x10021, /* Need EC to reboot to read-only code */ VBERROR_EC_REBOOT_TO_RO_REQUIRED = 0x10022, /* Invalid region read parameters */ |