diff options
| author | Luigi Semenzato <semenzato@google.com> | 2010-06-28 13:34:31 -0700 |
|---|---|---|
| committer | Luigi Semenzato <semenzato@google.com> | 2010-06-28 13:34:31 -0700 |
| commit | 2b9ddae52ba564dddcfc8bdcbed04dc07a52a7c6 (patch) | |
| tree | 13832a568a9bfca1f6851991ed681cba0db5928d /firmware/lib/vboot_firmware.c | |
| parent | 46186faf4620c9775836bf8ad703fb6c481e68cd (diff) | |
| download | vboot-2b9ddae52ba564dddcfc8bdcbed04dc07a52a7c6.tar.gz | |
New rollback_index API.
Review URL: http://codereview.chromium.org/2869022
Diffstat (limited to 'firmware/lib/vboot_firmware.c')
| -rw-r--r-- | firmware/lib/vboot_firmware.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/firmware/lib/vboot_firmware.c b/firmware/lib/vboot_firmware.c index 11ea6f77..c445a819 100644 --- a/firmware/lib/vboot_firmware.c +++ b/firmware/lib/vboot_firmware.c @@ -60,10 +60,12 @@ int LoadFirmware(LoadFirmwareParams* params) { } /* Initialize the TPM and read rollback indices. */ - if (0 != RollbackFirmwareSetup( - (params->boot_flags & BOOT_FLAG_DEVELOPER ? 1 : 0), - &tpm_key_version, &tpm_fw_version)) { - VBDEBUG(("Unable to get stored versions.\n")); + if (0 != RollbackFirmwareSetup(params->boot_flags & BOOT_FLAG_DEVELOPER)) { + VBDEBUG(("Unable to setup TPM.\n")); + return LOAD_FIRMWARE_RECOVERY; + } + if (0 != RollbackFirmwareRead(&tpm_key_version, &tpm_fw_version)) { + VBDEBUG(("Unable to read stored versions.\n")); return LOAD_FIRMWARE_RECOVERY; } |