On 01/26/15 20:03, Ard Biesheuvel wrote: > In order to allow a runtime self relocating PrePi instance, change the > allowable PCD types for the following PCDs: > > gArmTokenSpaceGuid.PcdSystemMemoryBase > gArmTokenSpaceGuid.PcdSystemMemorySize > gArmTokenSpaceGuid.PcdFdBaseAddress > gArmTokenSpaceGuid.PcdFvBaseAddress > > to include PcdsPatchableInModule. This makes the build system correctly > distinguish fixed PCDs from PCDs whose value may be different from the > assigned value at compile time. > > Note that this only affects platforms that explicitly mark these PCDs as > PatchableInModule in the DSC. All existing platforms that use FixedPcd > will not be affected by this change. > > Contributed-under: TianoCore Contribution Agreement 1.0 > Signed-off-by: Ard Biesheuvel <[email protected]> > --- > ArmPkg/ArmPkg.dec | 25 ++++++++++++++----------- > 1 file changed, 14 insertions(+), 11 deletions(-) > > diff --git a/ArmPkg/ArmPkg.dec b/ArmPkg/ArmPkg.dec > index d7a4826d931a..b01de13e5f78 100644 > --- a/ArmPkg/ArmPkg.dec > +++ b/ArmPkg/ArmPkg.dec > @@ -93,14 +93,6 @@ > gArmTokenSpaceGuid.PcdSecureFvSize|0x0|UINT32|0x00000030 > > # > - # ARM Normal (or Non Secure) Firmware PCDs > - # > - gArmTokenSpaceGuid.PcdFdBaseAddress|0|UINT64|0x0000002B > - gArmTokenSpaceGuid.PcdFdSize|0|UINT32|0x0000002C > - gArmTokenSpaceGuid.PcdFvBaseAddress|0|UINT64|0x0000002D > - gArmTokenSpaceGuid.PcdFvSize|0|UINT32|0x0000002E > - > - # > # ARM Hypervisor Firmware PCDs > # > gArmTokenSpaceGuid.PcdHypFdBaseAddress|0|UINT32|0x0000003A > @@ -127,6 +119,15 @@ > # Maximum file size for TFTP servers that do not support 'tsize' extension > gArmTokenSpaceGuid.PcdMaxTftpFileSize|0x01000000|UINT32|0x00000000 > > + # > + # ARM Normal (or Non Secure) Firmware PCDs > + # > + gArmTokenSpaceGuid.PcdFdSize|0|UINT32|0x0000002C > + gArmTokenSpaceGuid.PcdFvSize|0|UINT32|0x0000002E > + > +[PcdsFixedAtBuild.common, PcdsPatchableInModule.common] > + gArmTokenSpaceGuid.PcdFdBaseAddress|0|UINT64|0x0000002B > + gArmTokenSpaceGuid.PcdFvBaseAddress|0|UINT64|0x0000002D > > [PcdsFixedAtBuild.ARM] > # > @@ -207,16 +208,18 @@ > > > # > -# These PCDs are also defined as 'PcdsDynamic' to be redefined when using > UEFI in a > -# context of virtual machine. > +# These PCDs are also defined as 'PcdsDynamic' or 'PcdsPatchableInModule' to > be > +# redefined when using UEFI in a context of virtual machine. > # > -[PcdsFixedAtBuild.common, PcdsDynamic.common] > +[PcdsFixedAtBuild.common, PcdsDynamic.common, PcdsPatchableInModule.common] > + > # System Memory (DRAM): These PCDs define the region of in-built system > memory > # Some platforms can get DRAM extensions, these additional regions will be > declared > # to UEFI by ArmPlatformLib > gArmTokenSpaceGuid.PcdSystemMemoryBase|0|UINT64|0x00000029 > gArmTokenSpaceGuid.PcdSystemMemorySize|0|UINT64|0x0000002A > > +[PcdsFixedAtBuild.common, PcdsDynamic.common] > # > # ARM Architectural Timer > # >
Acked-by: Laszlo Ersek <[email protected]> ------------------------------------------------------------------------------ Dive into the World of Parallel Programming. The Go Parallel Website, sponsored by Intel and developed in partnership with Slashdot Media, is your hub for all things parallel software development, from weekly thought leadership blogs to news, videos, case studies, tutorials and more. Take a look and join the conversation now. http://goparallel.sourceforge.net/ _______________________________________________ edk2-devel mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/edk2-devel
