OvmfPkg/Csm/LegacyBiosDxe: Update to make it build for OVMF

[mirror_edk2.git] / SecurityPkg / Tcg / TcgConfigDxe / TcgConfigNvData.h

diff --git a/SecurityPkg/Tcg/TcgConfigDxe/TcgConfigNvData.h b/SecurityPkg/Tcg/TcgConfigDxe/TcgConfigNvData.h
index 359f4a2bf66aac9dce7be81cff4286d24712a976..43f740c585a955b1233b176e06c280715efe4337 100644 (file)
--- a/SecurityPkg/Tcg/TcgConfigDxe/TcgConfigNvData.h
+++ b/SecurityPkg/Tcg/TcgConfigDxe/TcgConfigNvData.h
@@ -1,14 +1,8 @@
 /** @file\r
   Header file for NV data structure definition.\r
 \r
-Copyright (c) 2011, 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) 2011 - 2018, Intel Corporation. All rights reserved.<BR>\r
+SPDX-License-Identifier: BSD-2-Clause-Patent\r
 \r
 **/\r
 \r
@@ -22,19 +16,15 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 #define TCG_CONFIGURATION_VARSTORE_ID  0x0001\r
 #define TCG_CONFIGURATION_FORM_ID      0x0001\r
 \r
-#define KEY_HIDE_TPM                   0x2000\r
-#define KEY_TPM_ACTION                 0x3000\r
-#define KEY_TPM_MOR_ENABLE             0x4000\r
+#define KEY_TPM_ACTION                         0x3000\r
 \r
-#define LABEL_TCG_CONFIGURATION_HIDETPM  0x0001\r
-#define LABEL_END                        0xffff\r
+#define LABEL_TCG_CONFIGURATION_TPM_OPERATION  0x0001\r
+#define LABEL_END                              0xffff\r
 \r
 //\r
 // Nv Data structure referenced by IFR\r
 //\r
 typedef struct {\r
-  BOOLEAN HideTpm;\r
-  BOOLEAN OriginalHideTpm;\r
   UINT8   TpmOperation;\r
   BOOLEAN TpmEnable;\r
   BOOLEAN TpmActivate;\r