From 2c19297e6cf004379415ec1dd7f8655befe2e536 Mon Sep 17 00:00:00 2001 From: Ard Biesheuvel Date: Fri, 7 Jun 2024 10:18:39 +0200 Subject: ArmVirtPkg/ArmVirtQemu: Revert "Permit the use of dynamic PCDs in PEI" This reverts commit 865229bcc8939c7a69d525f2b0627ef1532d5bc6, and restores the old state where dynamic PCDs are only used when TPM support is configured. Signed-off-by: Ard Biesheuvel --- ArmVirtPkg/ArmVirtQemu.fdf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'ArmVirtPkg/ArmVirtQemu.fdf') diff --git a/ArmVirtPkg/ArmVirtQemu.fdf b/ArmVirtPkg/ArmVirtQemu.fdf index 6073a31970..764f652afd 100644 --- a/ArmVirtPkg/ArmVirtQemu.fdf +++ b/ArmVirtPkg/ArmVirtQemu.fdf @@ -111,8 +111,8 @@ READ_LOCK_STATUS = TRUE INF ArmPkg/Drivers/CpuPei/CpuPei.inf INF MdeModulePkg/Core/DxeIplPeim/DxeIpl.inf - INF MdeModulePkg/Universal/PCD/Pei/Pcd.inf !if $(TPM2_ENABLE) == TRUE + INF MdeModulePkg/Universal/PCD/Pei/Pcd.inf INF MdeModulePkg/Universal/ResetSystemPei/ResetSystemPei.inf INF OvmfPkg/Tcg/Tcg2Config/Tcg2ConfigPei.inf INF SecurityPkg/Tcg/Tcg2Pei/Tcg2Pei.inf -- cgit From 2d5390053ff934ec1e94b84f5bb67400b3b75841 Mon Sep 17 00:00:00 2001 From: Ard Biesheuvel Date: Wed, 31 Jul 2024 12:08:35 +0200 Subject: ArmVirtPkg: Switch all PrePeiCore users to new Sec.inf Switch to the new SEC driver based on PrePeiCore, but with a sane name. The old one will be retired once all users have migrated, including many in edk2-platforms. Signed-off-by: Ard Biesheuvel --- ArmVirtPkg/ArmVirtQemu.fdf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'ArmVirtPkg/ArmVirtQemu.fdf') diff --git a/ArmVirtPkg/ArmVirtQemu.fdf b/ArmVirtPkg/ArmVirtQemu.fdf index 764f652afd..ac2040acff 100644 --- a/ArmVirtPkg/ArmVirtQemu.fdf +++ b/ArmVirtPkg/ArmVirtQemu.fdf @@ -104,7 +104,7 @@ READ_STATUS = TRUE READ_LOCK_CAP = TRUE READ_LOCK_STATUS = TRUE - INF ArmPlatformPkg/PrePeiCore/PrePeiCoreUniCore.inf + INF ArmPlatformPkg/Sec/Sec.inf INF MdeModulePkg/Core/Pei/PeiMain.inf INF ArmPlatformPkg/PlatformPei/PlatformPeim.inf INF ArmVirtPkg/MemoryInitPei/MemoryInitPeim.inf -- cgit