]> git.proxmox.com Git - mirror_edk2.git/blobdiff - SecurityPkg/Tcg/Tcg2Config/Tcg2Config.vfr
SecurityPkg: Replace BSD License with BSD+Patent License
[mirror_edk2.git] / SecurityPkg / Tcg / Tcg2Config / Tcg2Config.vfr
index a72f8246d1002ae93d50807b4f1d4764d923b4f8..12d8adb7eaebba2c6862bb33f48d91e3928cf332 100644 (file)
@@ -1,14 +1,8 @@
 /** @file\r
   VFR file used by the TCG2 configuration component.\r
 \r
-Copyright (c) 2015 - 2016, Intel Corporation. All rights reserved.<BR>\r
-This program and the accompanying materials \r
-are licensed and made available under the terms and conditions of the BSD License \r
-which accompanies this distribution.  The full text of the license may be found at \r
-http://opensource.org/licenses/bsd-license.php\r
-\r
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, \r
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
+Copyright (c) 2015 - 2018, Intel Corporation. All rights reserved.<BR>\r
+SPDX-License-Identifier: BSD-2-Clause-Patent\r
 \r
 **/\r
 \r
@@ -19,7 +13,7 @@ formset
   title     = STRING_TOKEN(STR_TCG2_TITLE),\r
   help      = STRING_TOKEN(STR_TCG2_HELP),\r
   classguid = EFI_HII_PLATFORM_SETUP_FORMSET_GUID,\r
-  \r
+\r
   efivarstore TCG2_CONFIGURATION_INFO,\r
     varid = TCG2_CONFIGURATION_INFO_VARSTORE_ID,\r
     attribute = 0x02,  // EFI variable attribures  EFI_VARIABLE_BOOTSERVICE_ACCESS\r
@@ -32,6 +26,12 @@ formset
     name  = TCG2_CONFIGURATION,\r
     guid  = TCG2_CONFIG_FORM_SET_GUID;\r
 \r
+  efivarstore TCG2_VERSION,\r
+    varid = TCG2_VERSION_VARSTORE_ID,\r
+    attribute = 0x03,  // EFI variable attribures  EFI_VARIABLE_BOOTSERVICE_ACCESS | EFI_VARIABLE_NON_VOLATILE\r
+    name  = TCG2_VERSION,\r
+    guid  = TCG2_CONFIG_FORM_SET_GUID;\r
+\r
   form formid = TCG2_CONFIGURATION_FORM_ID,\r
     title = STRING_TOKEN(STR_TCG2_TITLE);\r
 \r
@@ -52,6 +52,30 @@ formset
     endoneof;\r
 \r
     suppressif ideqvallist TCG2_CONFIGURATION.TpmDevice == TPM_DEVICE_NULL TPM_DEVICE_1_2;\r
+\r
+    subtitle text = STRING_TOKEN(STR_NULL);\r
+\r
+    text\r
+      help   = STRING_TOKEN(STR_TPM2_ACPI_HID_HELP),\r
+      text   = STRING_TOKEN(STR_TPM2_ACPI_HID_PROMPT),\r
+        text   = STRING_TOKEN(STR_TPM2_ACPI_HID_CONTENT);\r
+\r
+    text\r
+      help   = STRING_TOKEN(STR_TPM2_ACPI_REVISION_STATE_HELP),\r
+      text   = STRING_TOKEN(STR_TPM2_ACPI_REVISION_STATE_PROMPT),\r
+        text   = STRING_TOKEN(STR_TPM2_ACPI_REVISION_STATE_CONTENT);\r
+\r
+    oneof varid  = TCG2_VERSION.Tpm2AcpiTableRev,\r
+          questionid = KEY_TPM2_ACPI_REVISION,\r
+          prompt = STRING_TOKEN(STR_TPM2_ACPI_REVISION_PROMPT),\r
+          help   = STRING_TOKEN(STR_TPM2_ACPI_REVISION_HELP),\r
+          flags  = INTERACTIVE,\r
+            option text = STRING_TOKEN(STR_TPM2_ACPI_REVISION_3),     value = TPM2_ACPI_REVISION_3,     flags = RESET_REQUIRED;\r
+            option text = STRING_TOKEN(STR_TPM2_ACPI_REVISION_4),     value = TPM2_ACPI_REVISION_4,     flags = DEFAULT | MANUFACTURING | RESET_REQUIRED;\r
+    endoneof;\r
+\r
+    subtitle text = STRING_TOKEN(STR_NULL);\r
+\r
     text\r
       help   = STRING_TOKEN(STR_TCG2_DEVICE_INTERFACE_STATE_HELP),\r
       text   = STRING_TOKEN(STR_TCG2_DEVICE_INTERFACE_STATE_PROMPT),\r
@@ -96,6 +120,20 @@ formset
     subtitle text = STRING_TOKEN(STR_NULL);\r
     subtitle text = STRING_TOKEN(STR_TCG2_PP_OPERATION);\r
 \r
+    text\r
+      help   = STRING_TOKEN(STR_TCG2_PPI_VERSION_STATE_HELP),\r
+      text   = STRING_TOKEN(STR_TCG2_PPI_VERSION_STATE_PROMPT),\r
+        text   = STRING_TOKEN(STR_TCG2_PPI_VERSION_STATE_CONTENT);\r
+\r
+    oneof varid  = TCG2_VERSION.PpiVersion,\r
+          questionid = KEY_TCG2_PPI_VERSION,\r
+          prompt = STRING_TOKEN(STR_TCG2_PPI_VERSION_PROMPT),\r
+          help   = STRING_TOKEN(STR_TCG2_PPI_VERSION_HELP),\r
+          flags  = INTERACTIVE,\r
+            option text = STRING_TOKEN(STR_TCG2_PPI_VERSION_1_2), value = TCG2_PPI_VERSION_1_2, flags = RESET_REQUIRED;\r
+            option text = STRING_TOKEN(STR_TCG2_PPI_VERSION_1_3), value = TCG2_PPI_VERSION_1_3, flags = DEFAULT | MANUFACTURING | RESET_REQUIRED;\r
+    endoneof;\r
+\r
     oneof name = Tpm2Operation,\r
           questionid = KEY_TPM2_OPERATION,\r
           prompt = STRING_TOKEN(STR_TCG2_OPERATION),\r
@@ -109,11 +147,8 @@ formset
             option text = STRING_TOKEN(STR_TCG2_CHANGE_EPS), value = TCG2_PHYSICAL_PRESENCE_CHANGE_EPS, flags = RESET_REQUIRED;\r
             option text = STRING_TOKEN(STR_TCG2_LOG_ALL_DIGESTS), value = TCG2_PHYSICAL_PRESENCE_LOG_ALL_DIGESTS, flags = RESET_REQUIRED;\r
             option text = STRING_TOKEN(STR_TCG2_DISABLE_ENDORSEMENT_ENABLE_STORAGE_HIERARCHY), value = TCG2_PHYSICAL_PRESENCE_DISABLE_ENDORSEMENT_ENABLE_STORAGE_HIERARCHY, flags = RESET_REQUIRED;\r
-\r
-            option text = STRING_TOKEN(STR_TCG2_ENABLE_BLOCK_SID), value = TCG2_PHYSICAL_PRESENCE_ENABLE_BLOCK_SID, flags = RESET_REQUIRED;\r
-            option text = STRING_TOKEN(STR_TCG2_DISABLE_BLOCK_SID), value = TCG2_PHYSICAL_PRESENCE_DISABLE_BLOCK_SID, flags = RESET_REQUIRED;\r
     endoneof;\r
-    \r
+\r
     suppressif NOT questionref(Tpm2Operation) == TCG2_PHYSICAL_PRESENCE_SET_PCR_BANKS;\r
     numeric name = Tpm2OperationParameter,\r
             questionid = KEY_TPM2_OPERATION_PARAMETER,\r
@@ -157,7 +192,7 @@ formset
             questionid = KEY_TPM2_PCR_BANKS_REQUEST_0,\r
             prompt     = STRING_TOKEN(STR_TCG2_PCR_BANK_SHA1),\r
             help       = STRING_TOKEN(STR_TCG2_PCR_BANK_SHA1_HELP),\r
-            flags      = INTERACTIVE,\r
+            flags      = INTERACTIVE | RESET_REQUIRED,\r
             default    = 1,\r
     endcheckbox;\r
   endif;\r
@@ -167,7 +202,7 @@ formset
             questionid = KEY_TPM2_PCR_BANKS_REQUEST_1,\r
             prompt     = STRING_TOKEN(STR_TCG2_PCR_BANK_SHA256),\r
             help       = STRING_TOKEN(STR_TCG2_PCR_BANK_SHA256_HELP),\r
-            flags      = INTERACTIVE,\r
+            flags      = INTERACTIVE | RESET_REQUIRED,\r
             default    = 0,\r
     endcheckbox;\r
   endif;\r
@@ -177,7 +212,7 @@ formset
             questionid = KEY_TPM2_PCR_BANKS_REQUEST_2,\r
             prompt     = STRING_TOKEN(STR_TCG2_PCR_BANK_SHA384),\r
             help       = STRING_TOKEN(STR_TCG2_PCR_BANK_SHA384_HELP),\r
-            flags      = INTERACTIVE,\r
+            flags      = INTERACTIVE | RESET_REQUIRED,\r
             default    = 0,\r
     endcheckbox;\r
   endif;\r
@@ -187,7 +222,7 @@ formset
             questionid = KEY_TPM2_PCR_BANKS_REQUEST_3,\r
             prompt     = STRING_TOKEN(STR_TCG2_PCR_BANK_SHA512),\r
             help       = STRING_TOKEN(STR_TCG2_PCR_BANK_SHA512_HELP),\r
-            flags      = INTERACTIVE,\r
+            flags      = INTERACTIVE | RESET_REQUIRED,\r
             default    = 0,\r
     endcheckbox;\r
   endif;\r
@@ -197,7 +232,7 @@ formset
             questionid = KEY_TPM2_PCR_BANKS_REQUEST_4,\r
             prompt     = STRING_TOKEN(STR_TCG2_PCR_BANK_SM3_256),\r
             help       = STRING_TOKEN(STR_TCG2_PCR_BANK_SM3_256_HELP),\r
-            flags      = INTERACTIVE,\r
+            flags      = INTERACTIVE | RESET_REQUIRED,\r
             default    = 0,\r
     endcheckbox;\r
   endif;\r