diff options
| author | Randall Spangler <rspangler@chromium.org> | 2012-08-20 13:39:35 -0700 |
|---|---|---|
| committer | Gerrit <chrome-bot@google.com> | 2012-08-23 16:52:10 -0700 |
| commit | 89286bc73ac3939e4df8c5952346ce0825e1c76c (patch) | |
| tree | 822f46dbe136d39ac7d1012cfb267212a19a4e32 | |
| parent | 2ac65ecccfc695246a637ca4a1b37788ae59ed6e (diff) | |
| download | vboot-89286bc73ac3939e4df8c5952346ce0825e1c76c.tar.gz | |
Fix reporting TPM kernel version and firmware version on ZGB
These fields are part of the version 1 struct, but were mistakenly
labeled as version 2 fields. Since ZGB firmware produces a version 1
struct, crossystem was treating the fields as unavailable.
BUG=chromium-os:33685
TEST=crossystem tpm_fwver tpm_kernver
BRANCH=none (OS utility change, not firmware, and affects only Alex/ZGB)
Change-Id: Ic857ee2da9a7ae7f0d42317b711bf102d068de64
Signed-off-by: Randall Spangler <rspangler@chromium.org>
Reviewed-on: https://gerrit.chromium.org/gerrit/30904
Tested-by: Sonny Rao <sonnyrao@chromium.org>
Reviewed-by: Sonny Rao <sonnyrao@chromium.org>
| -rw-r--r-- | host/lib/crossystem.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/host/lib/crossystem.c b/host/lib/crossystem.c index d89c85ce..b5655433 100644 --- a/host/lib/crossystem.c +++ b/host/lib/crossystem.c @@ -342,6 +342,12 @@ int GetVdatInt(VdatIntField field) { case VDAT_INT_KERNEL_KEY_VERIFIED: value = (sh->flags & VBSD_KERNEL_KEY_VERIFIED ? 1 : 0); break; + case VDAT_INT_FW_VERSION_TPM: + value = (int)sh->fw_version_tpm; + break; + case VDAT_INT_KERNEL_VERSION_TPM: + value = (int)sh->kernel_version_tpm; + break; default: break; } @@ -361,12 +367,6 @@ int GetVdatInt(VdatIntField field) { case VDAT_INT_WPSW_BOOT: value = (sh->flags & VBSD_BOOT_FIRMWARE_WP_ENABLED ? 1 : 0); break; - case VDAT_INT_FW_VERSION_TPM: - value = (int)sh->fw_version_tpm; - break; - case VDAT_INT_KERNEL_VERSION_TPM: - value = (int)sh->kernel_version_tpm; - break; case VDAT_INT_RECOVERY_REASON: value = sh->recovery_reason; break; |