diff options
author | Daisuke Nojiri <dnojiri@chromium.org> | 2014-06-25 12:11:03 -0700 |
---|---|---|
committer | chrome-internal-fetch <chrome-internal-fetch@google.com> | 2014-06-26 02:42:52 +0000 |
commit | d11086caf05c692815ae6f90aa83a4fc30d50ed7 (patch) | |
tree | a6000ff77593cfaa60591c6dab4f2ddc887b36a7 /host/lib/crossystem.c | |
parent | 4cb5497984642b8cbd592c14cb1912a787b2d4d7 (diff) | |
download | vboot-d11086caf05c692815ae6f90aa83a4fc30d50ed7.tar.gz |
vboot2: add a flag to indicate firmware was selected by vboot2
TEST=Done manually on Nyan:
localhost ~ # sudo /tmp/crossystem fw_vboot2
0
localhost ~ # sudo /tmp/crossystem fw_vboot2=1
localhost ~ # sudo /tmp/crossystem fw_vboot2
0
# reboot with vboot2 firmware
localhost ~ # /tmp/crossystem fw_vboot2
1
BUG=none
BRANCH=none
Signed-off-by: Daisuke Nojiri <dnojiri@chromium.org>
Change-Id: I6ed553c48bdfebf07393f6f5f46832a60971314a
Reviewed-on: https://chromium-review.googlesource.com/205664
Reviewed-by: Randall Spangler <rspangler@chromium.org>
Commit-Queue: Daisuke Nojiri <dnojiri@chromium.org>
Tested-by: Daisuke Nojiri <dnojiri@chromium.org>
Diffstat (limited to 'host/lib/crossystem.c')
-rw-r--r-- | host/lib/crossystem.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/host/lib/crossystem.c b/host/lib/crossystem.c index 5e08c391..f88d22c6 100644 --- a/host/lib/crossystem.c +++ b/host/lib/crossystem.c @@ -47,7 +47,8 @@ typedef enum VdatIntField { VDAT_INT_TRIED_FIRMWARE_B, /* Tried firmware B due to fwb_tries */ VDAT_INT_KERNEL_KEY_VERIFIED, /* Kernel key verified using * signature, not just hash */ - VDAT_INT_RECOVERY_REASON /* Recovery reason for current boot */ + VDAT_INT_RECOVERY_REASON, /* Recovery reason for current boot */ + VDAT_INT_FW_BOOT2 /* Firmware selection by vboot2 */ } VdatIntField; @@ -395,6 +396,8 @@ int GetVdatInt(VdatIntField field) { case VDAT_INT_KERNEL_VERSION_TPM: value = (int)sh->kernel_version_tpm; break; + case VDAT_INT_FW_BOOT2: + value = (sh->flags & VBSD_BOOT_FIRMWARE_VBOOT2 ? 1 : 0); default: break; } @@ -459,6 +462,8 @@ int VbGetSystemPropertyInt(const char* name) { value = VbGetNvStorage(VBNV_CLEAR_TPM_OWNER_DONE); } else if (!strcasecmp(name,"fwb_tries")) { value = VbGetNvStorage(VBNV_TRY_B_COUNT); + } else if (!strcasecmp(name,"fw_vboot2")) { + value = GetVdatInt(VDAT_INT_FW_BOOT2); } else if (!strcasecmp(name,"fwupdate_tries")) { value = VbGetNvStorage(VBNV_KERNEL_FIELD); if (value != -1) |