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 /host/lib/crossystem.c | |
| 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 'host/lib/crossystem.c')
| -rw-r--r-- | host/lib/crossystem.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/host/lib/crossystem.c b/host/lib/crossystem.c index 994d4796..1eb540a3 100644 --- a/host/lib/crossystem.c +++ b/host/lib/crossystem.c @@ -514,8 +514,8 @@ int VbGetSystemPropertyInt(const char *name) value = vb2_get_nv_storage(VB2_NV_DEV_BOOT_FASTBOOT_FULL_CAP); } else if (!strcasecmp(name,"dev_enable_udc")) { value = vb2_get_nv_storage(VB2_NV_DEV_ENABLE_UDC); - } else if (!strcasecmp(name,"oprom_needed")) { - value = vb2_get_nv_storage(VB2_NV_OPROM_NEEDED); + } else if (!strcasecmp(name,"display_request")) { + value = vb2_get_nv_storage(VB2_NV_DISPLAY_REQUEST); } else if (!strcasecmp(name,"recovery_subcode")) { value = vb2_get_nv_storage(VB2_NV_RECOVERY_SUBCODE); } else if (!strcasecmp(name,"wipeout_request")) { @@ -662,8 +662,8 @@ int VbSetSystemPropertyInt(const char *name, int value) } else if (!strcasecmp(name,"fwb_tries") || !strcasecmp(name,"fw_try_count")) { return vb2_set_nv_storage(VB2_NV_TRY_COUNT, value); - } else if (!strcasecmp(name,"oprom_needed")) { - return vb2_set_nv_storage(VB2_NV_OPROM_NEEDED, value); + } else if (!strcasecmp(name,"display_request")) { + return vb2_set_nv_storage(VB2_NV_DISPLAY_REQUEST, value); } else if (!strcasecmp(name,"wipeout_request")) { /* Can only clear this flag, set only by firmware. */ return vb2_set_nv_storage(VB2_NV_REQ_WIPEOUT, 0); |