New rollback_index API.

firmware/lib/vboot_firmware.c

Index: firmware/lib/vboot_firmware.c
diff --git a/firmware/lib/vboot_firmware.c b/firmware/lib/vboot_firmware.c
index 11ea6f7772e1c78d9cf8e48ed8f9c5624814be89..c445a81970df363f6db68a3be0a0d0d4ddac4863 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;
   }