From 69223cc1bfe62bfb890e42adf87fcb8127030070 Mon Sep 17 00:00:00 2001 From: Michael Kubacki Date: Mon, 23 Sep 2024 08:08:51 -0400 Subject: [PATCH] QemuPkg: Remove LockBoxLib Not needed since S3 support is not used requiring the Lock Box. Signed-off-by: Michael Kubacki --- QemuPkg/Library/LockBoxLib/LockBoxBase.c | 36 -- QemuPkg/Library/LockBoxLib/LockBoxBaseLib.inf | 41 -- QemuPkg/Library/LockBoxLib/LockBoxDxe.c | 137 ------ QemuPkg/Library/LockBoxLib/LockBoxDxeLib.inf | 46 -- QemuPkg/Library/LockBoxLib/LockBoxLib.c | 408 ------------------ QemuPkg/Library/LockBoxLib/LockBoxLib.h | 52 --- QemuPkg/QemuPkg.dec | 3 - QemuPkg/QemuPkg.dsc | 2 - 8 files changed, 725 deletions(-) delete mode 100644 QemuPkg/Library/LockBoxLib/LockBoxBase.c delete mode 100644 QemuPkg/Library/LockBoxLib/LockBoxBaseLib.inf delete mode 100644 QemuPkg/Library/LockBoxLib/LockBoxDxe.c delete mode 100644 QemuPkg/Library/LockBoxLib/LockBoxDxeLib.inf delete mode 100644 QemuPkg/Library/LockBoxLib/LockBoxLib.c delete mode 100644 QemuPkg/Library/LockBoxLib/LockBoxLib.h diff --git a/QemuPkg/Library/LockBoxLib/LockBoxBase.c b/QemuPkg/Library/LockBoxLib/LockBoxBase.c deleted file mode 100644 index 00f03525cc..0000000000 --- a/QemuPkg/Library/LockBoxLib/LockBoxBase.c +++ /dev/null @@ -1,36 +0,0 @@ -/** @file - - Copyright (c) 2006 - 2014, Intel Corporation. All rights reserved.
- - SPDX-License-Identifier: BSD-2-Clause-Patent - -**/ - -#include - -#include -#include - -/** - Allocates a buffer of type EfiACPIMemoryNVS. - - Allocates the number bytes specified by AllocationSize of type - EfiACPIMemoryNVS and returns a pointer to the allocated buffer. - If AllocationSize is 0, then a valid buffer of 0 size is - returned. If there is not enough memory remaining to satisfy - the request, then NULL is returned. - - @param AllocationSize The number of bytes to allocate. - - @return A pointer to the allocated buffer or NULL if allocation fails. - -**/ -VOID * -EFIAPI -AllocateAcpiNvsPool ( - IN UINTN AllocationSize - ) -{ - ASSERT_EFI_ERROR (RETURN_UNSUPPORTED); - return NULL; -} diff --git a/QemuPkg/Library/LockBoxLib/LockBoxBaseLib.inf b/QemuPkg/Library/LockBoxLib/LockBoxBaseLib.inf deleted file mode 100644 index 7a7bab3464..0000000000 --- a/QemuPkg/Library/LockBoxLib/LockBoxBaseLib.inf +++ /dev/null @@ -1,41 +0,0 @@ -## @file -# -# Library implementing the LockBox interface for OVMF -# -# Copyright (C) 2013, Red Hat, Inc. -# Copyright (c) 2014, Intel Corporation. All rights reserved.
-# -# SPDX-License-Identifier: BSD-2-Clause-Patent -# -## - -[Defines] - INF_VERSION = 0x00010005 - BASE_NAME = LockBoxBaseLib - FILE_GUID = 17CA9B37-5BAB-492C-A09C-7121FBE34CE6 - MODULE_TYPE = BASE - VERSION_STRING = 1.0 - LIBRARY_CLASS = LockBoxLib - - CONSTRUCTOR = LockBoxLibInitialize - -[Sources] - LockBoxBase.c - LockBoxLib.c - LockBoxLib.h - -[Packages] - MdePkg/MdePkg.dec - MdeModulePkg/MdeModulePkg.dec - QemuPkg/QemuPkg.dec - -[LibraryClasses] - BaseMemoryLib - DebugLib - -[Pcd] - gQemuPkgTokenSpaceGuid.PcdOvmfLockBoxStorageBase - gQemuPkgTokenSpaceGuid.PcdOvmfLockBoxStorageSize - -[FeaturePcd] - gQemuPkgTokenSpaceGuid.PcdSmmSmramRequire diff --git a/QemuPkg/Library/LockBoxLib/LockBoxDxe.c b/QemuPkg/Library/LockBoxLib/LockBoxDxe.c deleted file mode 100644 index c9d679cb84..0000000000 --- a/QemuPkg/Library/LockBoxLib/LockBoxDxe.c +++ /dev/null @@ -1,137 +0,0 @@ -/** @file - - Copyright (c) 2006 - 2016, Intel Corporation. All rights reserved.
- - SPDX-License-Identifier: BSD-2-Clause-Patent - -**/ - -#include - -#include -#include -#include -#include -#include -#include - -/** - Allocate memory below 4G memory address. - - This function allocates memory below 4G memory address. - - @param MemoryType Memory type of memory to allocate. - @param Size Size of memory to allocate. - - @return Allocated address for output. - -**/ -STATIC -VOID * -AllocateMemoryBelow4G ( - IN EFI_MEMORY_TYPE MemoryType, - IN UINTN Size - ) -{ - UINTN Pages; - EFI_PHYSICAL_ADDRESS Address; - EFI_STATUS Status; - VOID *Buffer; - UINTN AllocRemaining; - - Pages = EFI_SIZE_TO_PAGES (Size); - Address = 0xffffffff; - - // - // Since we need to use gBS->AllocatePages to get a buffer below - // 4GB, there is a good chance that space will be wasted for very - // small allocation. We keep track of unused portions of the page - // allocations, and use these to allocate memory for small buffers. - // - ASSERT (mLockBoxGlobal->Signature == LOCK_BOX_GLOBAL_SIGNATURE); - if ((UINTN)mLockBoxGlobal->SubPageRemaining >= Size) { - Buffer = (VOID *)(UINTN)mLockBoxGlobal->SubPageBuffer; - mLockBoxGlobal->SubPageBuffer += (UINT32)Size; - mLockBoxGlobal->SubPageRemaining -= (UINT32)Size; - return Buffer; - } - - Status = gBS->AllocatePages ( - AllocateMaxAddress, - MemoryType, - Pages, - &Address - ); - if (EFI_ERROR (Status)) { - return NULL; - } - - Buffer = (VOID *)(UINTN)Address; - ZeroMem (Buffer, EFI_PAGES_TO_SIZE (Pages)); - - AllocRemaining = EFI_PAGES_TO_SIZE (Pages) - Size; - if (AllocRemaining > (UINTN)mLockBoxGlobal->SubPageRemaining) { - mLockBoxGlobal->SubPageBuffer = (UINT32)(Address + Size); - mLockBoxGlobal->SubPageRemaining = (UINT32)AllocRemaining; - } - - return Buffer; -} - -/** - Allocates a buffer of type EfiACPIMemoryNVS. - - Allocates the number bytes specified by AllocationSize of type - EfiACPIMemoryNVS and returns a pointer to the allocated buffer. - If AllocationSize is 0, then a valid buffer of 0 size is - returned. If there is not enough memory remaining to satisfy - the request, then NULL is returned. - - @param AllocationSize The number of bytes to allocate. - - @return A pointer to the allocated buffer or NULL if allocation fails. - -**/ -VOID * -EFIAPI -AllocateAcpiNvsPool ( - IN UINTN AllocationSize - ) -{ - return AllocateMemoryBelow4G (EfiACPIMemoryNVS, AllocationSize); -} - -EFI_STATUS -EFIAPI -LockBoxDxeLibInitialize ( - IN EFI_HANDLE ImageHandle, - IN EFI_SYSTEM_TABLE *SystemTable - ) -{ - EFI_STATUS Status; - VOID *Interface; - - Status = LockBoxLibInitialize (); - if (!EFI_ERROR (Status)) { - if (PcdGetBool (PcdAcpiS3Enable)) { - // - // When S3 enabled, the first driver run with this library linked will - // have this library constructor to install LockBox protocol on the - // ImageHandle. As other drivers may have gEfiLockBoxProtocolGuid - // dependency, the first driver should run before them. - // - Status = gBS->LocateProtocol (&gEfiLockBoxProtocolGuid, NULL, &Interface); - if (EFI_ERROR (Status)) { - Status = gBS->InstallProtocolInterface ( - &ImageHandle, - &gEfiLockBoxProtocolGuid, - EFI_NATIVE_INTERFACE, - NULL - ); - ASSERT_EFI_ERROR (Status); - } - } - } - - return Status; -} diff --git a/QemuPkg/Library/LockBoxLib/LockBoxDxeLib.inf b/QemuPkg/Library/LockBoxLib/LockBoxDxeLib.inf deleted file mode 100644 index ebe7b98425..0000000000 --- a/QemuPkg/Library/LockBoxLib/LockBoxDxeLib.inf +++ /dev/null @@ -1,46 +0,0 @@ -## @file -# -# Library implementing the LockBox interface for OVMF -# -# Copyright (C) 2013, Red Hat, Inc. -# Copyright (c) 2014 - 2016, Intel Corporation. All rights reserved.
-# -# SPDX-License-Identifier: BSD-2-Clause-Patent -# -## - -[Defines] - INF_VERSION = 0x00010005 - BASE_NAME = LockBoxDxeLib - FILE_GUID = f61c9a34-2e18-44ce-af2f-21a998e64fda - MODULE_TYPE = DXE_DRIVER - VERSION_STRING = 1.0 - LIBRARY_CLASS = LockBoxLib - - CONSTRUCTOR = LockBoxDxeLibInitialize - -[Sources] - LockBoxDxe.c - LockBoxLib.c - LockBoxLib.h - -[Packages] - MdePkg/MdePkg.dec - MdeModulePkg/MdeModulePkg.dec - QemuPkg/QemuPkg.dec - -[LibraryClasses] - BaseMemoryLib - DebugLib - UefiBootServicesTableLib - -[Protocols] - gEfiLockBoxProtocolGuid ## SOMETIMES_PRODUCES - -[Pcd] - gQemuPkgTokenSpaceGuid.PcdOvmfLockBoxStorageBase - gQemuPkgTokenSpaceGuid.PcdOvmfLockBoxStorageSize - gEfiMdeModulePkgTokenSpaceGuid.PcdAcpiS3Enable - -[FeaturePcd] - gQemuPkgTokenSpaceGuid.PcdSmmSmramRequire diff --git a/QemuPkg/Library/LockBoxLib/LockBoxLib.c b/QemuPkg/Library/LockBoxLib/LockBoxLib.c deleted file mode 100644 index 2000afeeb8..0000000000 --- a/QemuPkg/Library/LockBoxLib/LockBoxLib.c +++ /dev/null @@ -1,408 +0,0 @@ -/** @file - - Library implementing the LockBox interface for OVMF - - Copyright (C) 2013, Red Hat, Inc. - Copyright (c) 2010 - 2019, Intel Corporation. All rights reserved.
- - SPDX-License-Identifier: BSD-2-Clause-Patent - -**/ - -#include -#include -#include -#include -#include -#include - -#pragma pack(1) -typedef struct { - EFI_GUID Guid; - EFI_PHYSICAL_ADDRESS OrigAddress; - EFI_PHYSICAL_ADDRESS CopyAddress; - UINT32 Size; - UINT64 Attributes; -} LOCK_BOX_ENTRY; -#pragma pack() - -LOCK_BOX_GLOBAL *mLockBoxGlobal = NULL; -STATIC LOCK_BOX_ENTRY *StartOfEntries = NULL; -STATIC LOCK_BOX_ENTRY *EndOfEntries = NULL; - -RETURN_STATUS -EFIAPI -LockBoxLibInitialize ( - VOID - ) -{ - UINTN NumEntries; - - ASSERT (!FeaturePcdGet (PcdSmmSmramRequire)); - - if (PcdGet32 (PcdOvmfLockBoxStorageSize) < sizeof (LOCK_BOX_GLOBAL)) { - return RETURN_UNSUPPORTED; - } - - mLockBoxGlobal = (LOCK_BOX_GLOBAL *)(UINTN)PcdGet32 (PcdOvmfLockBoxStorageBase); - StartOfEntries = ((LOCK_BOX_ENTRY *)(mLockBoxGlobal + 1)); - NumEntries = ((PcdGet32 (PcdOvmfLockBoxStorageSize) - sizeof (LOCK_BOX_GLOBAL)) / - sizeof (LOCK_BOX_ENTRY)); - EndOfEntries = StartOfEntries + NumEntries; - if (mLockBoxGlobal->Signature != LOCK_BOX_GLOBAL_SIGNATURE) { - // - // Note: This code depends on the lock box being cleared in early - // PEI before usage, so the SubPageBuffer and SubPageRemaining - // fields don't need to be set to 0. - // - mLockBoxGlobal->Signature = LOCK_BOX_GLOBAL_SIGNATURE; - } - - return RETURN_SUCCESS; -} - -/** - Find LockBox entry based on GUID. - - @param[in] Guid The GUID to search for. - - @return Address of the LOCK_BOX_ENTRY found. - - If NULL, then the item was not found, and there is no space - left to store a new item. - - If non-NULL and LOCK_BOX_ENTRY.Size == 0, then the item was not - found, but a new item can be inserted at the returned location. - - If non-NULL and LOCK_BOX_ENTRY.Size > 0, then the item was found. -**/ -STATIC -LOCK_BOX_ENTRY * -EFIAPI -FindHeaderByGuid ( - IN CONST EFI_GUID *Guid - ) -{ - LOCK_BOX_ENTRY *Header; - - for (Header = StartOfEntries; Header < EndOfEntries; Header++) { - if ((Header->Size == 0) || CompareGuid (Guid, &Header->Guid)) { - return Header; - } - } - - return NULL; -} - -/** - This function will save confidential information to lockbox. - - @param Guid the guid to identify the confidential information - @param Buffer the address of the confidential information - @param Length the length of the confidential information - - @retval RETURN_SUCCESS the information is saved successfully. - @retval RETURN_INVALID_PARAMETER the Guid is NULL, or Buffer is NULL, or - Length is 0 - @retval RETURN_ALREADY_STARTED the requested GUID already exist. - @retval RETURN_OUT_OF_RESOURCES no enough resource to save the information. - @retval RETURN_ACCESS_DENIED it is too late to invoke this interface - @retval RETURN_NOT_STARTED it is too early to invoke this interface - @retval RETURN_UNSUPPORTED the service is not supported by - implementaion. -**/ -RETURN_STATUS -EFIAPI -SaveLockBox ( - IN GUID *Guid, - IN VOID *Buffer, - IN UINTN Length - ) -{ - LOCK_BOX_ENTRY *Header; - VOID *CopyBuffer; - - DEBUG (( - DEBUG_VERBOSE, - "%a: Guid=%g Buffer=%p Length=0x%x\n", - __FUNCTION__, - Guid, - Buffer, - (UINT32)Length - )); - - if ((Guid == NULL) || (Buffer == NULL) || (Length == 0)) { - return RETURN_INVALID_PARAMETER; - } - - if (Length > 0xFFFFFFFF) { - return RETURN_OUT_OF_RESOURCES; - } - - Header = FindHeaderByGuid (Guid); - if (Header == NULL) { - return RETURN_OUT_OF_RESOURCES; - } - - if (Header->Size > 0) { - return RETURN_ALREADY_STARTED; - } - - CopyBuffer = AllocateAcpiNvsPool (Length); - if (CopyBuffer == NULL) { - return RETURN_OUT_OF_RESOURCES; - } - - // - // overwrite the current terminator header with new metadata - // - CopyGuid (&Header->Guid, Guid); - Header->OrigAddress = (UINTN)Buffer; - Header->CopyAddress = (UINTN)CopyBuffer; - Header->Size = (UINT32)Length; - Header->Attributes = 0; - - // - // copy contents - // - CopyMem (CopyBuffer, Buffer, Length); - - return RETURN_SUCCESS; -} - -/** - This function will set lockbox attributes. - - @param Guid the guid to identify the confidential information - @param Attributes the attributes of the lockbox - - @retval RETURN_SUCCESS the information is saved successfully. - @retval RETURN_INVALID_PARAMETER attributes is invalid. - @retval RETURN_NOT_FOUND the requested GUID not found. - @retval RETURN_ACCESS_DENIED it is too late to invoke this interface - @retval RETURN_NOT_STARTED it is too early to invoke this interface - @retval RETURN_UNSUPPORTED the service is not supported by - implementaion. -**/ -RETURN_STATUS -EFIAPI -SetLockBoxAttributes ( - IN GUID *Guid, - IN UINT64 Attributes - ) -{ - LOCK_BOX_ENTRY *Header; - - DEBUG (( - DEBUG_VERBOSE, - "%a: Guid=%g Attributes=0x%Lx\n", - __FUNCTION__, - Guid, - Attributes - )); - - if (Guid == NULL) { - return RETURN_INVALID_PARAMETER; - } - - Header = FindHeaderByGuid (Guid); - if (!Header || (Header->Size == 0)) { - return RETURN_NOT_FOUND; - } - - Header->Attributes = Attributes; - - return RETURN_SUCCESS; -} - -/** - This function will update confidential information to lockbox. - - @param Guid the guid to identify the original confidential information - @param Offset the offset of the original confidential information - @param Buffer the address of the updated confidential information - @param Length the length of the updated confidential information - - @retval RETURN_SUCCESS the information is saved successfully. - @retval RETURN_INVALID_PARAMETER the Guid is NULL, or Buffer is NULL, or - Length is 0. - @retval RETURN_NOT_FOUND the requested GUID not found. - @retval RETURN_BUFFER_TOO_SMALL for lockbox without attribute - LOCK_BOX_ATTRIBUTE_RESTORE_IN_S3_ONLY, the - original buffer to too small to hold new - information. - @retval RETURN_OUT_OF_RESOURCES for lockbox with attribute - LOCK_BOX_ATTRIBUTE_RESTORE_IN_S3_ONLY, no - enough resource to save the information. - @retval RETURN_ACCESS_DENIED it is too late to invoke this interface - @retval RETURN_NOT_STARTED it is too early to invoke this interface - @retval RETURN_UNSUPPORTED the service is not supported by - implementaion. -**/ -RETURN_STATUS -EFIAPI -UpdateLockBox ( - IN GUID *Guid, - IN UINTN Offset, - IN VOID *Buffer, - IN UINTN Length - ) -{ - LOCK_BOX_ENTRY *Header; - - DEBUG (( - DEBUG_VERBOSE, - "%a: Guid=%g Offset=0x%x Length=0x%x\n", - __FUNCTION__, - Guid, - (UINT32)Offset, - (UINT32)Length - )); - - if ((Guid == NULL) || (Buffer == NULL) || (Length == 0)) { - return RETURN_INVALID_PARAMETER; - } - - Header = FindHeaderByGuid (Guid); - if (!Header || (Header->Size == 0)) { - return RETURN_NOT_FOUND; - } - - if ((Header->Size < Offset) || - (Length > Header->Size - Offset)) - { - return RETURN_BUFFER_TOO_SMALL; - } - - CopyMem ((UINT8 *)(UINTN)(Header->CopyAddress) + Offset, Buffer, Length); - - return RETURN_SUCCESS; -} - -/** - This function will restore confidential information from lockbox. - - @param Guid the guid to identify the confidential information - @param Buffer the address of the restored confidential information - NULL means restored to original address, Length MUST be NULL at - same time. - @param Length the length of the restored confidential information - - @retval RETURN_SUCCESS the information is restored successfully. - @retval RETURN_INVALID_PARAMETER the Guid is NULL, or one of Buffer and - Length is NULL. - @retval RETURN_WRITE_PROTECTED Buffer and Length are NULL, but the LockBox - has no LOCK_BOX_ATTRIBUTE_RESTORE_IN_PLACE - attribute. - @retval RETURN_BUFFER_TOO_SMALL the Length is too small to hold the - confidential information. - @retval RETURN_NOT_FOUND the requested GUID not found. - @retval RETURN_NOT_STARTED it is too early to invoke this interface - @retval RETURN_ACCESS_DENIED not allow to restore to the address - @retval RETURN_UNSUPPORTED the service is not supported by - implementaion. -**/ -RETURN_STATUS -EFIAPI -RestoreLockBox ( - IN GUID *Guid, - IN VOID *Buffer OPTIONAL, - IN OUT UINTN *Length OPTIONAL - ) -{ - LOCK_BOX_ENTRY *Header; - - DEBUG (( - DEBUG_VERBOSE, - "%a: Guid=%g Buffer=%p\n", - __FUNCTION__, - Guid, - Buffer - )); - - if ((Guid == NULL) || - ((Buffer == NULL) && (Length != NULL)) || - ((Buffer != NULL) && (Length == NULL))) - { - return EFI_INVALID_PARAMETER; - } - - Header = FindHeaderByGuid (Guid); - if (!Header || (Header->Size == 0)) { - return RETURN_NOT_FOUND; - } - - if (Buffer == NULL) { - if (!(Header->Attributes & LOCK_BOX_ATTRIBUTE_RESTORE_IN_PLACE)) { - return RETURN_WRITE_PROTECTED; - } - - if (Header->OrigAddress + (Header->Size - 1) > MAX_ADDRESS) { - return RETURN_UNSUPPORTED; - } - - Buffer = (VOID *)(UINTN)Header->OrigAddress; - } - - // - // Set RestoreLength - // - if (Length != NULL) { - if (Header->Size > *Length) { - // - // Input buffer is too small to hold all data. - // - *Length = Header->Size; - return EFI_BUFFER_TOO_SMALL; - } - - *Length = Header->Size; - } - - CopyMem (Buffer, (VOID *)(UINTN)Header->CopyAddress, Header->Size); - - return RETURN_SUCCESS; -} - -/** - This function will restore confidential information from all lockbox which - have RestoreInPlace attribute. - - @retval RETURN_SUCCESS the information is restored successfully. - @retval RETURN_NOT_STARTED it is too early to invoke this interface - @retval RETURN_UNSUPPORTED the service is not supported by - implementaion. -**/ -RETURN_STATUS -EFIAPI -RestoreAllLockBoxInPlace ( - VOID - ) -{ - LOCK_BOX_ENTRY *Header; - - for (Header = StartOfEntries; - Header < EndOfEntries && Header->Size > 0; - Header++) - { - if (Header->Attributes & LOCK_BOX_ATTRIBUTE_RESTORE_IN_PLACE) { - VOID *Buffer; - - if (Header->OrigAddress + (Header->Size - 1) > MAX_ADDRESS) { - return RETURN_UNSUPPORTED; - } - - Buffer = (VOID *)(UINTN)Header->OrigAddress; - CopyMem (Buffer, (VOID *)(UINTN)Header->CopyAddress, Header->Size); - DEBUG (( - DEBUG_VERBOSE, - "%a: Guid=%g Buffer=%p\n", - __FUNCTION__, - &Header->Guid, - Buffer - )); - } - } - - return RETURN_SUCCESS; -} diff --git a/QemuPkg/Library/LockBoxLib/LockBoxLib.h b/QemuPkg/Library/LockBoxLib/LockBoxLib.h deleted file mode 100644 index a5392c9124..0000000000 --- a/QemuPkg/Library/LockBoxLib/LockBoxLib.h +++ /dev/null @@ -1,52 +0,0 @@ -/** @file - - Copyright (c) 2006 - 2014, Intel Corporation. All rights reserved.
- - SPDX-License-Identifier: BSD-2-Clause-Patent - -**/ - -#ifndef __LOCK_BOX_LIB_IMPL_H__ -#define __LOCK_BOX_LIB_IMPL_H__ - -#pragma pack(1) - -typedef struct { - UINT32 Signature; - UINT32 SubPageBuffer; - UINT32 SubPageRemaining; -} LOCK_BOX_GLOBAL; - -#define LOCK_BOX_GLOBAL_SIGNATURE SIGNATURE_32('L', 'B', 'G', 'S') - -extern LOCK_BOX_GLOBAL *mLockBoxGlobal; - -#pragma pack() - -/** - Allocates a buffer of type EfiACPIMemoryNVS. - - Allocates the number bytes specified by AllocationSize of type - EfiACPIMemoryNVS and returns a pointer to the allocated buffer. - If AllocationSize is 0, then a valid buffer of 0 size is - returned. If there is not enough memory remaining to satisfy - the request, then NULL is returned. - - @param AllocationSize The number of bytes to allocate. - - @return A pointer to the allocated buffer or NULL if allocation fails. - -**/ -VOID * -EFIAPI -AllocateAcpiNvsPool ( - IN UINTN AllocationSize - ); - -RETURN_STATUS -EFIAPI -LockBoxLibInitialize ( - VOID - ); - -#endif diff --git a/QemuPkg/QemuPkg.dec b/QemuPkg/QemuPkg.dec index e29ae4de0a..1e9652da3d 100644 --- a/QemuPkg/QemuPkg.dec +++ b/QemuPkg/QemuPkg.dec @@ -66,9 +66,6 @@ gQemuPkgTokenSpaceGuid.PcdVirtioScsiMaxTargetLimit|31|UINT16|0x2 gQemuPkgTokenSpaceGuid.PcdVirtioScsiMaxLunLimit|7|UINT32|0x3 - gQemuPkgTokenSpaceGuid.PcdOvmfLockBoxStorageBase|0x0|UINT32|0x4 - gQemuPkgTokenSpaceGuid.PcdOvmfLockBoxStorageSize|0x0|UINT32|0x5 - [PcdsFixedAtBuild, PcdsDynamic, PcdsDynamicEx] gQemuPkgTokenSpaceGuid.PcdOvmfHostBridgePciDevId|0|UINT16|0x10 diff --git a/QemuPkg/QemuPkg.dsc b/QemuPkg/QemuPkg.dsc index 9d32a1e7ee..f86410df5f 100644 --- a/QemuPkg/QemuPkg.dsc +++ b/QemuPkg/QemuPkg.dsc @@ -127,8 +127,6 @@ QemuPkg/Library/ConfigSystemModeLibQemu/ConfigSystemModeLib.inf QemuPkg/Library/DfciDeviceIdSupportLib/DfciDeviceIdSupportLib.inf QemuPkg/Library/DfciUiSupportLib/DfciUiSupportLib.inf - QemuPkg/Library/LockBoxLib/LockBoxBaseLib.inf - QemuPkg/Library/LockBoxLib/LockBoxDxeLib.inf QemuPkg/Library/MsBootOptionsLibQemu/MsBootOptionsLib.inf QemuPkg/Library/PlatformBmPrintScLib/PlatformBmPrintScLib.inf QemuPkg/Library/PlatformSecureLib/PlatformSecureLib.inf