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

vboot_firmware/lib/include/tss_constants.h

 /* 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.
  *
  * Some TPM constants and type definitions for standalone compilation for use in
  * the firmware
  */
 
 /* FIXME(gauravsh):
  * NOTE: This file is copied over from
@@ skipping 10 matching lines @@
 #include <stdint.h>
 
 #define TPM_MAX_COMMAND_SIZE 4096
 #define TPM_LARGE_ENOUGH_COMMAND_SIZE 256  /* saves space in the firmware */
 
 #define TPM_SUCCESS ((uint32_t)0x00000000)
 #define TPM_E_BADINDEX ((uint32_t)0x00000002)
 #define TPM_E_MAXNVWRITES ((uint32_t)0x00000048)
 #define TPM_E_ALREADY_INITIALIZED ((uint32_t)0x00005000)     /* vboot local */
 #define TPM_E_INTERNAL_INCONSISTENCY ((uint32_t)0x00005001)  /* vboot local */
+#define TPM_E_MUST_REBOOT            ((uint32_t)0x00005002)  /* vboot local */
 
 #define TPM_NV_INDEX0 ((uint32_t)0x00000000)
 #define TPM_NV_INDEX_LOCK ((uint32_t)0xffffffff)
 #define TPM_NV_PER_WRITE_STCLEAR (((uint32_t)1)<<14)
 #define TPM_NV_PER_PPWRITE (((uint32_t)1)<<0)
 #define TPM_NV_PER_GLOBALLOCK (((uint32_t)1)<<15)
 
 typedef uint8_t TSS_BOOL;
 typedef uint16_t TPM_STRUCTURE_TAG;
 
@@ skipping 28 matching lines @@
     TSS_BOOL disableFullDALogicInfo;
 } TPM_PERMANENT_FLAGS;
 
 #define TPM_ALL_LOCALITIES (TPM_LOC_ZERO | TPM_LOC_ONE | TPM_LOC_TWO \
                             | TPM_LOC_THREE | TPM_LOC_FOUR)  /* 0x1f */
 
 #define TPM_ENCAUTH_SIZE 20
 #define TPM_PUBEK_SIZE 256
 
 #endif  /* TPM_LITE_TSS_CONSTANTS_H_ */