| Andrew Geissler | 80d4184 | 2023-09-11 08:36:15 -0400 | [diff] [blame] | 1 | From caef501f2c05ba2170d0a449856900919021d6f6 Mon Sep 17 00:00:00 2001 |
| 2 | From: Your Name <you@example.com> |
| 3 | Date: Fri, 10 Mar 2023 18:47:09 +0000 |
| 4 | Subject: [PATCH] Revert "ArmVirtPkg/ArmVirtQemu: omit PCD PEIM unless TPM |
| 5 | support is enabled" |
| 6 | |
| 7 | This reverts commit b6efc505e4d6eb2055a39afd0a1ee67846a1e5f9. |
| 8 | |
| 9 | Upstream-Status: Inappropriate [other] |
| 10 | Signed-off-by: Jon Mason <jon.mason@arm.com> |
| 11 | |
| 12 | --- |
| 13 | ArmVirtPkg/ArmVirtQemu.dsc | 22 +++++----------------- |
| 14 | ArmVirtPkg/ArmVirtQemu.fdf | 2 +- |
| 15 | 2 files changed, 6 insertions(+), 18 deletions(-) |
| 16 | |
| 17 | diff --git a/ArmVirtPkg/ArmVirtQemu.dsc b/ArmVirtPkg/ArmVirtQemu.dsc |
| 18 | index 2e786dad12..0f8157a032 100644 |
| 19 | --- a/ArmVirtPkg/ArmVirtQemu.dsc |
| 20 | +++ b/ArmVirtPkg/ArmVirtQemu.dsc |
| 21 | @@ -293,15 +293,10 @@ |
| 22 | #
|
| 23 | # TPM2 support
|
| 24 | #
|
| 25 | -!if $(TPM2_ENABLE) == TRUE
|
| 26 | gEfiSecurityPkgTokenSpaceGuid.PcdTpmBaseAddress|0x0
|
| 27 | +!if $(TPM2_ENABLE) == TRUE
|
| 28 | gEfiSecurityPkgTokenSpaceGuid.PcdTpmInstanceGuid|{0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}
|
| 29 | gEfiSecurityPkgTokenSpaceGuid.PcdTpm2HashMask|0
|
| 30 | -!else
|
| 31 | -[PcdsPatchableInModule]
|
| 32 | - # make this PCD patchable instead of dynamic when TPM support is not enabled
|
| 33 | - # this permits setting the PCD in unreachable code without pulling in dynamic PCD support
|
| 34 | - gEfiSecurityPkgTokenSpaceGuid.PcdTpmBaseAddress|0x0
|
| 35 | !endif
|
| 36 |
|
| 37 | [PcdsDynamicHii]
|
| 38 | @@ -314,13 +309,6 @@ |
| 39 |
|
| 40 | gEfiMdePkgTokenSpaceGuid.PcdPlatformBootTimeOut|L"Timeout"|gEfiGlobalVariableGuid|0x0|5
|
| 41 |
|
| 42 | -[LibraryClasses.common.PEI_CORE, LibraryClasses.common.PEIM]
|
| 43 | -!if $(TPM2_ENABLE) == TRUE
|
| 44 | - PcdLib|MdePkg/Library/PeiPcdLib/PeiPcdLib.inf
|
| 45 | -!else
|
| 46 | - PcdLib|MdePkg/Library/BasePcdLibNull/BasePcdLibNull.inf
|
| 47 | -!endif
|
| 48 | -
|
| 49 | ################################################################################
|
| 50 | #
|
| 51 | # Components Section - list of all EDK II Modules needed by this Platform
|
| 52 | @@ -332,6 +320,10 @@ |
| 53 | #
|
| 54 | ArmPlatformPkg/PrePeiCore/PrePeiCoreUniCore.inf
|
| 55 | MdeModulePkg/Core/Pei/PeiMain.inf
|
| 56 | + MdeModulePkg/Universal/PCD/Pei/Pcd.inf {
|
| 57 | + <LibraryClasses>
|
| 58 | + PcdLib|MdePkg/Library/BasePcdLibNull/BasePcdLibNull.inf
|
| 59 | + }
|
| 60 | ArmPlatformPkg/PlatformPei/PlatformPeim.inf
|
| 61 | ArmVirtPkg/MemoryInitPei/MemoryInitPeim.inf {
|
| 62 | <LibraryClasses>
|
| 63 | @@ -342,10 +334,6 @@ |
| 64 | ArmPkg/Drivers/CpuPei/CpuPei.inf
|
| 65 |
|
| 66 | !if $(TPM2_ENABLE) == TRUE
|
| 67 | - MdeModulePkg/Universal/PCD/Pei/Pcd.inf {
|
| 68 | - <LibraryClasses>
|
| 69 | - PcdLib|MdePkg/Library/BasePcdLibNull/BasePcdLibNull.inf
|
| 70 | - }
|
| 71 | MdeModulePkg/Universal/ResetSystemPei/ResetSystemPei.inf {
|
| 72 | <LibraryClasses>
|
| 73 | ResetSystemLib|ArmVirtPkg/Library/ArmVirtPsciResetSystemPeiLib/ArmVirtPsciResetSystemPeiLib.inf
|
| 74 | diff --git a/ArmVirtPkg/ArmVirtQemu.fdf b/ArmVirtPkg/ArmVirtQemu.fdf |
| 75 | index 764f652afd..c85e36b185 100644 |
| 76 | --- a/ArmVirtPkg/ArmVirtQemu.fdf |
| 77 | +++ b/ArmVirtPkg/ArmVirtQemu.fdf |
| 78 | @@ -109,10 +109,10 @@ READ_LOCK_STATUS = TRUE |
| 79 | INF ArmPlatformPkg/PlatformPei/PlatformPeim.inf
|
| 80 | INF ArmVirtPkg/MemoryInitPei/MemoryInitPeim.inf
|
| 81 | INF ArmPkg/Drivers/CpuPei/CpuPei.inf
|
| 82 | + INF MdeModulePkg/Universal/PCD/Pei/Pcd.inf
|
| 83 | INF MdeModulePkg/Core/DxeIplPeim/DxeIpl.inf
|
| 84 |
|
| 85 | !if $(TPM2_ENABLE) == TRUE
|
| 86 | - INF MdeModulePkg/Universal/PCD/Pei/Pcd.inf
|
| 87 | INF MdeModulePkg/Universal/ResetSystemPei/ResetSystemPei.inf
|
| 88 | INF OvmfPkg/Tcg/Tcg2Config/Tcg2ConfigPei.inf
|
| 89 | INF SecurityPkg/Tcg/Tcg2Pei/Tcg2Pei.inf
|