ArmPlatformPkg/PrePi: don't expose PE/COFF and LZMA libraries via HOBs

Avoid the need to preserve all memory exposed by PrePi indefinitely
by removing the 'feature' that exposes the PE/COFF and LZMA libraries
via special HOBs to other modules that may want to reuse the code.

Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>
Reviewed-by: Leif Lindholm <leif.lindholm@linaro.org>

1 files changed, 0 insertions, 11 deletions

diff --git a/ArmPlatformPkg/PrePi/PrePi.c b/ArmPlatformPkg/PrePi/PrePi.c
index 221bad55a3..02cff7ddc2 100644
--- a/ArmPlatformPkg/PrePi/PrePi.c
+++ b/ArmPlatformPkg/PrePi/PrePi.c
@@ -17,7 +17,6 @@
 #include <Library/DebugAgentLib.h>

 #include <Library/PrePiLib.h>

 #include <Library/PrintLib.h>

-#include <Library/PeCoffGetEntryPointLib.h>

 #include <Library/PrePiHobListPointerLib.h>

 #include <Library/TimerLib.h>

 #include <Library/PerformanceLib.h>

@@ -25,10 +24,8 @@
 #include <Ppi/GuidedSectionExtraction.h>

 #include <Ppi/ArmMpCoreInfo.h>

 #include <Ppi/SecPerformance.h>

-#include <Guid/LzmaDecompress.h>

 

 #include "PrePi.h"

-#include "LzmaDecompress.h"

 

 #define IS_XIP() (((UINT64)FixedPcdGet64 (PcdFdBaseAddress) > mSystemMemoryEnd) || \

                   ((FixedPcdGet64 (PcdFdBaseAddress) + FixedPcdGet32 (PcdFdSize)) < FixedPcdGet64 (PcdSystemMemoryBase)))

@@ -155,14 +152,6 @@ PrePiMain (
   // SEC phase needs to run library constructors by hand.

   ProcessLibraryConstructorList ();

 

-  // Build HOBs to pass up our version of stuff the DXE Core needs to save space

-  BuildPeCoffLoaderHob ();

-  BuildExtractSectionHob (

-    &gLzmaCustomDecompressGuid,

-    LzmaGuidedSectionGetInfo,

-    LzmaGuidedSectionExtraction

-    );

-

   // Assume the FV that contains the SEC (our code) also contains a compressed FV.

   Status = DecompressFirstFv ();

   ASSERT_EFI_ERROR (Status);