From 6acd6781ba4f2bc0d397ed7b1f1115b9569634b1 Mon Sep 17 00:00:00 2001 From: Eric Dong Date: Wed, 6 Dec 2017 14:42:24 +0800 Subject: SecurityPkg/OpalPasswordExtraInfoVariable.h: Remove the deprecated guid and variable. After Opal solution enhance BlockSid solution to consume the TCG PP. This variable and guid definition is deprecated. Signed-off-by: Eric Dong --- .../Include/Guid/OpalPasswordExtraInfoVariable.h | 27 ---------------------- SecurityPkg/SecurityPkg.dec | 4 ---- .../Tcg/Opal/OpalPasswordDxe/OpalPasswordDxe.inf | 1 - 3 files changed, 32 deletions(-) delete mode 100644 SecurityPkg/Include/Guid/OpalPasswordExtraInfoVariable.h diff --git a/SecurityPkg/Include/Guid/OpalPasswordExtraInfoVariable.h b/SecurityPkg/Include/Guid/OpalPasswordExtraInfoVariable.h deleted file mode 100644 index f16d0a4ac3..0000000000 --- a/SecurityPkg/Include/Guid/OpalPasswordExtraInfoVariable.h +++ /dev/null @@ -1,27 +0,0 @@ -/** @file - Defines Name GUIDs to represent an Opal device variable guid for Opal Security Feature. - -Copyright (c) 2016, Intel Corporation. All rights reserved.
-This program and the accompanying materials -are licensed and made available under the terms and conditions of the BSD License -which accompanies this distribution. The full text of the license may be found at -http://opensource.org/licenses/bsd-license.php - -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. - -**/ - -#ifndef _OPAL_PASSWORD_EXTRA_INFO_VARIABLE_H_ -#define _OPAL_PASSWORD_EXTRA_INFO_VARIABLE_H_ - -#define OPAL_EXTRA_INFO_VAR_NAME L"OpalExtraInfo" - -typedef struct { - UINT8 EnableBlockSid; -} OPAL_EXTRA_INFO_VAR; - -extern EFI_GUID gOpalExtraInfoVariableGuid; - -#endif // _OPAL_PASSWORD_SECURITY_VARIABLE_H_ - diff --git a/SecurityPkg/SecurityPkg.dec b/SecurityPkg/SecurityPkg.dec index 2f14bbc443..e58ac22f8e 100644 --- a/SecurityPkg/SecurityPkg.dec +++ b/SecurityPkg/SecurityPkg.dec @@ -202,10 +202,6 @@ # Include/Guid/TrEEConfigHii.h gTrEEConfigFormSetGuid = {0xc54b425f, 0xaa79, 0x48b4, { 0x98, 0x1f, 0x99, 0x8b, 0x3c, 0x4b, 0x64, 0x1c }} - ## Include/OpalPasswordExtraInfoVariable.h - gOpalExtraInfoVariableGuid = {0x44a2ad5d, 0x612c, 0x47b3, {0xb0, 0x6e, 0xc8, 0xf5, 0x0b, 0xfb, 0xf0, 0x7d}} - - [Ppis] ## The PPI GUID for that TPM physical presence should be locked. # Include/Ppi/LockPhysicalPresence.h diff --git a/SecurityPkg/Tcg/Opal/OpalPasswordDxe/OpalPasswordDxe.inf b/SecurityPkg/Tcg/Opal/OpalPasswordDxe/OpalPasswordDxe.inf index f2afc37810..2e186fd033 100644 --- a/SecurityPkg/Tcg/Opal/OpalPasswordDxe/OpalPasswordDxe.inf +++ b/SecurityPkg/Tcg/Opal/OpalPasswordDxe/OpalPasswordDxe.inf @@ -76,7 +76,6 @@ [Guids] gEfiEventExitBootServicesGuid ## CONSUMES ## Event - gOpalExtraInfoVariableGuid ## PRODUCES ## GUID [Depex] gEfiSmmCommunicationProtocolGuid AND gEfiHiiStringProtocolGuid AND gEfiHiiDatabaseProtocolGuid -- cgit v1.2.3