Add NV storage fields for firmware flags

host/lib/crossystem.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.
  */
 
 #include <stdio.h>
 #include <string.h>
 
 #include "host_common.h"
 
@@ skipping 466 matching lines @@
     if (-1 != value && FwidStartsWith("Mario."))
       value = 1 - value;  /* Mario reports this backwards */
   }
   /* Saved memory is at a fixed location for all H2C BIOS.  If the CHSW
    * path exists in sysfs, it's a H2C BIOS. */
   else if (!strcasecmp(name,"savedmem_base")) {
     return (-1 == ReadFileInt(ACPI_CHSW_PATH) ? -1 : 0x00F00000);
   } else if (!strcasecmp(name,"savedmem_size")) {
     return (-1 == ReadFileInt(ACPI_CHSW_PATH) ? -1 : 0x00100000);
   }
+  /* NV storage values with no defaults for older BIOS. */
+  else if (!strcasecmp(name,"tried_fwb")) {
+    value = VbGetNvStorage(VBNV_FW_USED_TRY_B);
+  }
   /* NV storage values.  If unable to get from NV storage, fall back to the
    * CMOS reboot field used by older BIOS. */
   else if (!strcasecmp(name,"recovery_request")) {
     value = VbGetNvStorage(VBNV_RECOVERY_REQUEST);
     if (-1 == value)
       value = VbGetCmosRebootField(CMOSRF_RECOVERY);
   } else if (!strcasecmp(name,"dbg_reset")) {
     value = VbGetNvStorage(VBNV_DEBUG_RESET_MODE);
     if (-1 == value)
       value = VbGetCmosRebootField(CMOSRF_DEBUG_RESET);
@@ skipping 44 matching lines @@
     return VbReadMainFwType(dest, size);
   } else if (!strcasecmp(name,"ecfw_act")) {
     switch(ReadFileInt(ACPI_BINF_PATH ".2")) {
       case 0:
         return StrCopy(dest, "RO", size);
       case 1:
         return StrCopy(dest, "RW", size);
       default:
         return NULL;
     }
+  } else if (!strcasecmp(name,"kernkey_vfy")) {
+    switch(VbGetNvStorage(VBNV_FW_VERIFIED_KERNEL_KEY)) {
+      case 0:
+        return "hash";
+      case 1:
+        return "sig";
+      default:
+        return NULL;
+    }
   } else
     return NULL;
 }
 
 
 /* Set a system property integer.
  *
  * Returns 0 if success, -1 if error. */
 int VbSetSystemPropertyInt(const char* name, int value) {
 
@@ skipping 22 matching lines @@
 
 
 /* Set a system property string.
  *
  * Returns 0 if success, -1 if error. */
 int VbSetSystemPropertyString(const char* name, const char* value) {
 
   /* TODO: support setting */
   return -1;
 }