| From caef501f2c05ba2170d0a449856900919021d6f6 Mon Sep 17 00:00:00 2001 |
| From: Your Name <you@example.com> |
| Date: Fri, 10 Mar 2023 18:47:09 +0000 |
| Subject: [PATCH] Revert "ArmVirtPkg/ArmVirtQemu: omit PCD PEIM unless TPM |
| support is enabled" |
| |
| This reverts commit b6efc505e4d6eb2055a39afd0a1ee67846a1e5f9. |
| |
| Upstream-Status: Inappropriate [other] |
| Signed-off-by: Jon Mason <jon.mason@arm.com> |
| |
| --- |
| ArmVirtPkg/ArmVirtQemu.dsc | 22 +++++----------------- |
| ArmVirtPkg/ArmVirtQemu.fdf | 2 +- |
| 2 files changed, 6 insertions(+), 18 deletions(-) |
| |
| diff --git a/ArmVirtPkg/ArmVirtQemu.dsc b/ArmVirtPkg/ArmVirtQemu.dsc |
| index 2e786dad12..0f8157a032 100644 |
| --- a/ArmVirtPkg/ArmVirtQemu.dsc |
| +++ b/ArmVirtPkg/ArmVirtQemu.dsc |
| @@ -293,15 +293,10 @@ |
| #
|
| # TPM2 support
|
| #
|
| -!if $(TPM2_ENABLE) == TRUE
|
| gEfiSecurityPkgTokenSpaceGuid.PcdTpmBaseAddress|0x0
|
| +!if $(TPM2_ENABLE) == TRUE
|
| gEfiSecurityPkgTokenSpaceGuid.PcdTpmInstanceGuid|{0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}
|
| gEfiSecurityPkgTokenSpaceGuid.PcdTpm2HashMask|0
|
| -!else
|
| -[PcdsPatchableInModule]
|
| - # make this PCD patchable instead of dynamic when TPM support is not enabled
|
| - # this permits setting the PCD in unreachable code without pulling in dynamic PCD support
|
| - gEfiSecurityPkgTokenSpaceGuid.PcdTpmBaseAddress|0x0
|
| !endif
|
|
|
| [PcdsDynamicHii]
|
| @@ -314,13 +309,6 @@ |
|
|
| gEfiMdePkgTokenSpaceGuid.PcdPlatformBootTimeOut|L"Timeout"|gEfiGlobalVariableGuid|0x0|5
|
|
|
| -[LibraryClasses.common.PEI_CORE, LibraryClasses.common.PEIM]
|
| -!if $(TPM2_ENABLE) == TRUE
|
| - PcdLib|MdePkg/Library/PeiPcdLib/PeiPcdLib.inf
|
| -!else
|
| - PcdLib|MdePkg/Library/BasePcdLibNull/BasePcdLibNull.inf
|
| -!endif
|
| -
|
| ################################################################################
|
| #
|
| # Components Section - list of all EDK II Modules needed by this Platform
|
| @@ -332,6 +320,10 @@ |
| #
|
| ArmPlatformPkg/PrePeiCore/PrePeiCoreUniCore.inf
|
| MdeModulePkg/Core/Pei/PeiMain.inf
|
| + MdeModulePkg/Universal/PCD/Pei/Pcd.inf {
|
| + <LibraryClasses>
|
| + PcdLib|MdePkg/Library/BasePcdLibNull/BasePcdLibNull.inf
|
| + }
|
| ArmPlatformPkg/PlatformPei/PlatformPeim.inf
|
| ArmVirtPkg/MemoryInitPei/MemoryInitPeim.inf {
|
| <LibraryClasses>
|
| @@ -342,10 +334,6 @@ |
| ArmPkg/Drivers/CpuPei/CpuPei.inf
|
|
|
| !if $(TPM2_ENABLE) == TRUE
|
| - MdeModulePkg/Universal/PCD/Pei/Pcd.inf {
|
| - <LibraryClasses>
|
| - PcdLib|MdePkg/Library/BasePcdLibNull/BasePcdLibNull.inf
|
| - }
|
| MdeModulePkg/Universal/ResetSystemPei/ResetSystemPei.inf {
|
| <LibraryClasses>
|
| ResetSystemLib|ArmVirtPkg/Library/ArmVirtPsciResetSystemPeiLib/ArmVirtPsciResetSystemPeiLib.inf
|
| diff --git a/ArmVirtPkg/ArmVirtQemu.fdf b/ArmVirtPkg/ArmVirtQemu.fdf |
| index 764f652afd..c85e36b185 100644 |
| --- a/ArmVirtPkg/ArmVirtQemu.fdf |
| +++ b/ArmVirtPkg/ArmVirtQemu.fdf |
| @@ -109,10 +109,10 @@ READ_LOCK_STATUS = TRUE |
| INF ArmPlatformPkg/PlatformPei/PlatformPeim.inf
|
| INF ArmVirtPkg/MemoryInitPei/MemoryInitPeim.inf
|
| INF ArmPkg/Drivers/CpuPei/CpuPei.inf
|
| + INF MdeModulePkg/Universal/PCD/Pei/Pcd.inf
|
| INF MdeModulePkg/Core/DxeIplPeim/DxeIpl.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
|