sravan/system76-edk2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

OvmfPkg: replace SECURE_BOOT_FEATURE_ENABLED with PcdSecureBootSupported

Browse Source 
Drop the '-D SECURE_BOOT_FEATURE_ENABLED' compile time option,
use a new FeaturePcd instead.

Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
This commit is contained in:
Gerd Hoffmann
2023-04-21 08:55:44 +02:00
committed by mergify[bot]
parent a818a873e5
commit 92da8a154f
11 changed files with 20 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
OvmfPkg/PlatformPei/Platform.c
View File

@@ -222,9 +222,10 @@ ReserveEmuVariableNvStore (
VariableStore = (EFI_PHYSICAL_ADDRESS)(UINTN)PlatformReserveEmuVariableNvStore ();
PcdStatus = PcdSet64S (PcdEmuVariableNvStoreReserved, VariableStore);
#ifdef SECURE_BOOT_FEATURE_ENABLED
PlatformInitEmuVariableNvStore ((VOID *)(UINTN)VariableStore);
#endif
if (FeaturePcdGet (PcdSecureBootSupported)) {
// restore emulated VarStore from pristine ROM copy
PlatformInitEmuVariableNvStore ((VOID *)(UINTN)VariableStore);
}
ASSERT_RETURN_ERROR (PcdStatus);
}

1
OvmfPkg/PlatformPei/PlatformPei.inf
View File

@@ -94,6 +94,7 @@
gUefiOvmfPkgTokenSpaceGuid.PcdQ35SmramAtDefaultSmbase
gUefiOvmfPkgTokenSpaceGuid.PcdXenPvhStartOfDayStructPtr
gUefiOvmfPkgTokenSpaceGuid.PcdXenPvhStartOfDayStructPtrSize
gUefiOvmfPkgTokenSpaceGuid.PcdSecureBootSupported
gEfiMdePkgTokenSpaceGuid.PcdGuidedExtractHandlerTableAddress
gEfiMdePkgTokenSpaceGuid.PcdPciExpressBaseAddress
gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwSpareSize