Browse Source

Platform/Socionext/DeveloperBox: align with upstream StandaloneMmPkg changes

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.biesheuvel@linaro.org>
Reviewed-by: Leif Lindholm <leif.lindholm at linaro.org>
Ard Biesheuvel 5 years ago
parent
commit
0a32c15d21

+ 4 - 1
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

+ 3 - 4
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