Add NV storage fields for firmware flags

firmware/lib/vboot_nvstorage.c

 /* Copyright (c) 2011 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.
  */
 
 /* Non-volatile storage routines.
  */
 
 #include "utility.h"
 #include "vboot_common.h"
 #include "vboot_nvstorage.h"
 
 /* Constants for NV storage.  We use this rather than structs and
  * bitfields so the data format is consistent across platforms and
  * compilers. */
 #define HEADER_OFFSET                0
-#define HEADER_MASK                    0xC0
-#define HEADER_SIGNATURE               0x40
-#define HEADER_FIRMWARE_SETTINGS_RESET 0x20
-#define HEADER_KERNEL_SETTINGS_RESET   0x10
+#define HEADER_MASK                     0xC0
+#define HEADER_SIGNATURE                0x40
+#define HEADER_FIRMWARE_SETTINGS_RESET  0x20
+#define HEADER_KERNEL_SETTINGS_RESET    0x10
 
 #define BOOT_OFFSET                  1
-#define BOOT_DEBUG_RESET_MODE          0x80
-#define BOOT_TRY_B_COUNT               0x0F
+#define BOOT_DEBUG_RESET_MODE           0x80
+#define BOOT_TRY_B_COUNT                0x0F
 
 #define RECOVERY_OFFSET              2
 #define LOCALIZATION_OFFSET          3
+
+#define FIRMWARE_FLAGS_OFFSET        5
+#define FIRMWARE_FW_USED_TRY_B          0x80
+#define FIRMWARE_FW_VERIFIED_KERNEL_KEY 0x40
+
 #define KERNEL_FIELD_OFFSET         11
 #define CRC_OFFSET                  15
 
 
 /* Return CRC-8 of the data, using x^8 + x^2 + x + 1 polynomial.  A
  * table-based algorithm would be faster, but for only 15 bytes isn't
  * worth the code size. */
 static uint8_t Crc8(const uint8_t* data, int len) {
   unsigned crc = 0;
   int i, j;
@@ skipping 75 matching lines @@
       *dest = raw[LOCALIZATION_OFFSET];
       return 0;
 
     case VBNV_KERNEL_FIELD:
       *dest = (raw[KERNEL_FIELD_OFFSET]
                | (raw[KERNEL_FIELD_OFFSET + 1] << 8)
                | (raw[KERNEL_FIELD_OFFSET + 2] << 16)
                | (raw[KERNEL_FIELD_OFFSET + 3] << 24));
       return 0;
 
+    case VBNV_FW_USED_TRY_B:
+      *dest = (raw[FIRMWARE_FLAGS_OFFSET] & FIRMWARE_FW_USED_TRY_B ? 1 : 0);
+      return 0;
+
+    case VBNV_FW_VERIFIED_KERNEL_KEY:
+      *dest = (raw[FIRMWARE_FLAGS_OFFSET] & FIRMWARE_FW_VERIFIED_KERNEL_KEY ?
+               1 : 0);
+      return 0;
+
     default:
       return 1;
   }
 }
 
 
 int VbNvSet(VbNvContext* context, VbNvParam param, uint32_t value) {
   uint8_t* raw = context->raw;
   uint32_t current;
 
@@ skipping 47 matching lines @@
       raw[LOCALIZATION_OFFSET] = (uint8_t)value;
       break;
 
     case VBNV_KERNEL_FIELD:
       raw[KERNEL_FIELD_OFFSET] = (uint8_t)(value);
       raw[KERNEL_FIELD_OFFSET + 1] = (uint8_t)(value >> 8);
       raw[KERNEL_FIELD_OFFSET + 2] = (uint8_t)(value >> 16);
       raw[KERNEL_FIELD_OFFSET + 3] = (uint8_t)(value >> 24);
       break;
 
+    case VBNV_FW_USED_TRY_B:
+      if (value)
+        raw[FIRMWARE_FLAGS_OFFSET] |= FIRMWARE_FW_USED_TRY_B;
+      else
+        raw[FIRMWARE_FLAGS_OFFSET] &= ~FIRMWARE_FW_USED_TRY_B;
+      break;
+
+    case VBNV_FW_VERIFIED_KERNEL_KEY:
+      if (value)
+        raw[FIRMWARE_FLAGS_OFFSET] |= FIRMWARE_FW_VERIFIED_KERNEL_KEY;
+      else
+        raw[FIRMWARE_FLAGS_OFFSET] &= ~FIRMWARE_FW_VERIFIED_KERNEL_KEY;
+      break;
+
     default:
       return 1;
   }
 
   /* Need to regenerate CRC, since the value changed. */
   context->regenerate_crc = 1;
   return 0;
 }