Fix normal/recovery mode, and RO firmware vs. RW firmware behavior.

vboot_firmware/lib/firmware_image_fw.c

 /* Copyright (c) 2010 The Chromium OS Authors. All rights reserved.
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  *
  * Functions for verifying a verified boot firmware image.
  * (Firmware Portion)
  */
 
 #include "firmware_image_fw.h"
 
@@ skipping 255 matching lines @@
    * (firmware_key_version << 16 | firmware_version) where
    * [firmware_key_version] [firmware_version] are both 16-bit.
    */
   uint32_t firmwareA_lversion, firmwareB_lversion;
   uint8_t firmwareA_is_verified = 0;  /* Whether firmwareA verify succeeded. */
   uint32_t min_lversion;  /* Minimum of firmware A and firmware lversion. */
   uint32_t stored_lversion;  /* Stored logical version in the TPM. */
   uint16_t version, key_version;  /* Temporary variables */
 
   /* Initialize the TPM since we'll be reading the rollback indices. */
-  SetupTPM();
+  SetupTPM(0, 0);
 
   /* We get the key versions by reading directly from the image blobs without
    * any additional (expensive) sanity checking on the blob since it's faster to
    * outright reject a firmware with an older firmware key version. A malformed
    * or corrupted firmware blob will still fail when VerifyFirmware() is called
    * on it.
    */
   firmwareA_lversion = GetLogicalFirmwareVersion(verification_headerA);
   firmwareB_lversion = GetLogicalFirmwareVersion(verification_headerB);
   min_lversion  = Min(firmwareA_lversion, firmwareB_lversion);
@@ skipping 52 matching lines @@
      */
     if (stored_lversion <= firmwareB_lversion &&
         (VERIFY_FIRMWARE_SUCCESS == VerifyFirmware(root_key_blob,
                                                    verification_headerB,
                                                    firmwareB)))
         return BOOT_FIRMWARE_B_CONTINUE;
   }
   /* D'oh: No bootable firmware. */
   return BOOT_FIRMWARE_RECOVERY_CONTINUE;
 }