On Fri, Mar 29, 2019 at 08:32:31AM +0100, Ard Biesheuvel wrote: > On Fri, 8 Mar 2019 at 16:31, Ard Biesheuvel <ard.biesheu...@linaro.org> wrote: > > > > Bring DeveloperBox in line with EDK2 core changes to StandaloneMmPkg: > > - switch from BaseExtractGuidedSectionLib to PrePiExtractGuidedSectionLib > > - include a NULL library class resolution for VariableMmDependency > > > > Contributed-under: TianoCore Contribution Agreement 1.1 > > Signed-off-by: Ard Biesheuvel <ard.biesheu...@linaro.org> > > Leif, > > I'd like to merge this today if you don't have any objections.
None - that was implied in https://lists.01.org/pipermail/edk2-devel/2019-March/038167.html (There wasn't a 0/2 to put a "for series" on.) / Leif > > --- > > Platform/Socionext/DeveloperBox/DeveloperBox.dsc | 5 ++++- > > Platform/Socionext/DeveloperBox/DeveloperBoxMm.dsc | 7 +++---- > > 2 files changed, 7 insertions(+), 5 deletions(-) > > > > diff --git a/Platform/Socionext/DeveloperBox/DeveloperBox.dsc > > b/Platform/Socionext/DeveloperBox/DeveloperBox.dsc > > index 31afc4aac3c4..39077ab5ee79 100644 > > --- a/Platform/Socionext/DeveloperBox/DeveloperBox.dsc > > +++ b/Platform/Socionext/DeveloperBox/DeveloperBox.dsc > > @@ -293,7 +293,10 @@ > > VarCheckLib|MdeModulePkg/Library/VarCheckLib/VarCheckLib.inf > > } > > !else > > - ArmPkg/Drivers/MmCommunicationDxe/MmCommunication.inf > > + ArmPkg/Drivers/MmCommunicationDxe/MmCommunication.inf { > > + <LibraryClasses> > > + > > NULL|StandaloneMmPkg/Library/VariableMmDependency/VariableMmDependency.inf > > + } > > MdeModulePkg/Universal/Variable/RuntimeDxe/VariableSmmRuntimeDxe.inf > > > > SecurityPkg/VariableAuthenticated/SecureBootConfigDxe/SecureBootConfigDxe.inf > > !endif > > diff --git a/Platform/Socionext/DeveloperBox/DeveloperBoxMm.dsc > > b/Platform/Socionext/DeveloperBox/DeveloperBoxMm.dsc > > index 55c5fbb7350d..141b175047b2 100644 > > --- a/Platform/Socionext/DeveloperBox/DeveloperBoxMm.dsc > > +++ b/Platform/Socionext/DeveloperBox/DeveloperBoxMm.dsc > > @@ -68,9 +68,6 @@ > > [PcdsFixedAtBuild] > > gEfiMdeModulePkgTokenSpaceGuid.PcdSerialRegisterBase|0x51040000 > > > > -[PcdsPatchableInModule] > > - gEfiMdePkgTokenSpaceGuid.PcdGuidedExtractHandlerTableAddress|0x0 > > - > > > > ################################################################################ > > # > > # Components Section - list of all EDK II Modules needed by this Platform > > @@ -82,8 +79,10 @@ > > # > > StandaloneMmPkg/Core/StandaloneMmCore.inf { > > <LibraryClasses> > > - > > ExtractGuidedSectionLib|MdePkg/Library/BaseExtractGuidedSectionLib/BaseExtractGuidedSectionLib.inf > > + > > ExtractGuidedSectionLib|EmbeddedPkg/Library/PrePiExtractGuidedSectionLib/PrePiExtractGuidedSectionLib.inf > > > > NULL|MdeModulePkg/Library/LzmaCustomDecompressLib/LzmaCustomDecompressLib.inf > > + <PcdsFixedAtBuild> > > + gEfiMdePkgTokenSpaceGuid.PcdMaximumGuidedExtractHandler|0x2 > > } > > > > StandaloneMmPkg/Drivers/StandaloneMmCpu/AArch64/StandaloneMmCpu.inf > > -- > > 2.20.1 > > _______________________________________________ edk2-devel mailing list edk2-devel@lists.01.org https://lists.01.org/mailman/listinfo/edk2-devel
