Skip to content

Commit 9a1e08a

Browse files
makubackios-d
authored andcommitted
ArmVirtPkg: QemuVirtMemInfoPeiLib: Allow PcdSystemMemorySize to be non-fixed
Platforms today may use this PCD as a dynamic PCD as that is an allowed type in its PCD declaration. From `ArmPkg.dec`: [PcdsFixedAtBuild.common, PcdsDynamic.common, PcdsPatchableInModule.common] gArmTokenSpaceGuid.PcdSystemMemorySize|0|UINT64|0x0000002A This library causes a build error if it used as a dynamic PCD since it places the PCD in a `[FixedPcd]` section in the INF. Other libraries do set the PCD and depend on the dynamic PCD behavior. Since this library accesses the PCD with `PcdGet64 ()` which is compatible with FixedAtBuild PCDs, this change moves the PCD out an explicit `[FixedPcd]` section to resolve the following build error: ``` INFO - : error 3000: Building modules from source INFs, following PCD use Dynamic and FixedAtBuild access method. It must be corrected to use only one access method. INFO - gArmTokenSpaceGuid.PcdSystemMemorySize ``` Signed-off-by: Michael Kubacki <[email protected]>
1 parent 100b667 commit 9a1e08a

File tree

1 file changed

+6
-1
lines changed

1 file changed

+6
-1
lines changed

ArmVirtPkg/Library/QemuVirtMemInfoLib/QemuVirtMemInfoPeiLib.inf

+6-1
Original file line numberDiff line numberDiff line change
@@ -38,11 +38,16 @@
3838
[Guids]
3939
gArmVirtSystemMemorySizeGuid
4040

41+
# MU_CHANGE [BEGIN] - Allow PcdSystemMemorySize to be referenced per allowed (i.e. DEC declaration) PCD types
42+
[Pcd]
43+
gArmTokenSpaceGuid.PcdSystemMemorySize
44+
# MU_CHANGE [END] - Allow PcdSystemMemorySize to be referenced per allowed (i.e. DEC declaration) PCD types
45+
4146
[FixedPcd]
4247
gArmTokenSpaceGuid.PcdFdBaseAddress
4348
gArmTokenSpaceGuid.PcdFvBaseAddress
4449
gArmTokenSpaceGuid.PcdSystemMemoryBase
45-
gArmTokenSpaceGuid.PcdSystemMemorySize
50+
# gArmTokenSpaceGuid.PcdSystemMemorySize # MU_CHANGE - Allow the PCD to be referenced per allowed PCD types
4651
gArmTokenSpaceGuid.PcdFdSize
4752
gArmTokenSpaceGuid.PcdFvSize
4853
gUefiOvmfPkgTokenSpaceGuid.PcdDeviceTreeInitialBaseAddress

0 commit comments

Comments
 (0)