ArmPkg: Renamed library 'PL390GicLib' into 'ArmGicLib'

[mirror_edk2.git] / ArmPlatformPkg / PrePi / PrePi.c

diff --git a/ArmPlatformPkg/PrePi/PrePi.c b/ArmPlatformPkg/PrePi/PrePi.c
index 860befdc2b1e9c3ddde533071d102e9e4d3820c3..c4060d9b6369543482edd7c7f54cd94f38aebb66 100755 (executable)
--- a/ArmPlatformPkg/PrePi/PrePi.c
+++ b/ArmPlatformPkg/PrePi/PrePi.c
@@ -15,10 +15,12 @@
 #include <PiPei.h>\r
 \r
 #include <Library/DebugAgentLib.h>\r
+#include <Library/BaseMemoryLib.h>\r
 #include <Library/PrePiLib.h>\r
 #include <Library/IoLib.h>\r
 #include <Library/PrintLib.h>\r
 #include <Library/PeCoffGetEntryPointLib.h>\r
+#include <Library/PrePiHobListPointerLib.h>\r
 #include <Library/TimerLib.h>\r
 #include <Library/PerformanceLib.h>\r
 \r
@@ -52,7 +54,7 @@ PrePiMain (
   IN  UINT64                    StartTimeStamp\r
   )\r
 {\r
-  EFI_HOB_HANDOFF_INFO_TABLE**  PrePiHobBase;\r
+  EFI_HOB_HANDOFF_INFO_TABLE*   HobList;\r
   EFI_STATUS                    Status;\r
   CHAR8                         Buffer[100];\r
   UINTN                         CharCount;\r
@@ -83,15 +85,14 @@ PrePiMain (
   // Check the PcdCPUCoresNonSecStackBase match with the calculated StackBase\r
   ASSERT (StacksBase == PcdGet32 (PcdCPUCoresNonSecStackBase));\r
   \r
-  PrePiHobBase = (EFI_HOB_HANDOFF_INFO_TABLE**)(PcdGet32 (PcdCPUCoresNonSecStackBase) + (PcdGet32 (PcdCPUCoresNonSecStackSize) / 2) - PcdGet32 (PcdHobListPtrGlobalOffset));\r
-\r
   // Declare the PI/UEFI memory region\r
-  *PrePiHobBase = HobConstructor (\r
+  HobList = HobConstructor (\r
     (VOID*)UefiMemoryBase,\r
     FixedPcdGet32 (PcdSystemMemoryUefiRegionSize),\r
     (VOID*)UefiMemoryBase,\r
     (VOID*)StacksBase  // The top of the UEFI Memory is reserved for the stacks\r
     );\r
+  PrePeiSetHobList (HobList);\r
 \r
   // Initialize MMU and Memory HOBs (Resource Descriptor HOBs)\r
   Status = MemoryPeim (UefiMemoryBase, FixedPcdGet32 (PcdSystemMemoryUefiRegionSize));\r