ArmPkg/ArmLib: Clean ArmV7Lib

[mirror_edk2.git] / ArmPlatformPkg / PrePeiCore / MainUniCore.c

diff --git a/ArmPlatformPkg/PrePeiCore/MainUniCore.c b/ArmPlatformPkg/PrePeiCore/MainUniCore.c
index 179e1ea344d405a74722830e1c75162b67c5151c..65682b155d4882e8f0325b451df82560594cb7e1 100644 (file)
--- a/ArmPlatformPkg/PrePeiCore/MainUniCore.c
+++ b/ArmPlatformPkg/PrePeiCore/MainUniCore.c
@@ -12,12 +12,8 @@
 *\r
 **/\r
 \r
-#include <Chipset/ArmV7.h>\r
-\r
 #include "PrePeiCore.h"\r
 \r
-extern EFI_PEI_PPI_DESCRIPTOR *gSecPpiTable;\r
-\r
 VOID\r
 EFIAPI\r
 SecondaryMain (\r
@@ -34,7 +30,18 @@ PrimaryMain (
   )\r
 {\r
   EFI_SEC_PEI_HAND_OFF        SecCoreData;\r
+  UINTN                       PpiListSize;\r
+  EFI_PEI_PPI_DESCRIPTOR      *PpiList;\r
+  UINTN                       TemporaryRamBase;\r
+  UINTN                       TemporaryRamSize;\r
+\r
+  CreatePpiList (&PpiListSize, &PpiList);\r
 \r
+  // Adjust the Temporary Ram as the new Ppi List (Common + Platform Ppi Lists) is created at\r
+  // the base of the primary core stack\r
+  PpiListSize = ALIGN_VALUE(PpiListSize, 0x4);\r
+  TemporaryRamBase = (UINTN)PcdGet32 (PcdCPUCoresStackBase) + PpiListSize;\r
+  TemporaryRamSize = (UINTN)PcdGet32 (PcdCPUCorePrimaryStackSize) - PpiListSize;\r
 \r
   //\r
   // Bind this information into the SEC hand-off state\r
@@ -42,15 +49,15 @@ PrimaryMain (
   // Note also:  HOBs (pei temp ram) MUST be above stack\r
   //\r
   SecCoreData.DataSize               = sizeof(EFI_SEC_PEI_HAND_OFF);\r
-  SecCoreData.BootFirmwareVolumeBase = (VOID *)(UINTN)PcdGet32 (PcdNormalFvBaseAddress);\r
-  SecCoreData.BootFirmwareVolumeSize = PcdGet32 (PcdNormalFvSize);\r
-  SecCoreData.TemporaryRamBase       = (VOID *)(UINTN)PcdGet32 (PcdCPUCoresNonSecStackBase); // We consider we run on the primary core (and so we use the first stack)\r
-  SecCoreData.TemporaryRamSize       = (UINTN)(UINTN)PcdGet32 (PcdCPUCoresNonSecStackSize);\r
-  SecCoreData.PeiTemporaryRamBase    = (VOID *)((UINTN)(SecCoreData.TemporaryRamBase) + (SecCoreData.TemporaryRamSize / 2));\r
+  SecCoreData.BootFirmwareVolumeBase = (VOID *)(UINTN)PcdGet32 (PcdFvBaseAddress);\r
+  SecCoreData.BootFirmwareVolumeSize = PcdGet32 (PcdFvSize);\r
+  SecCoreData.TemporaryRamBase       = (VOID *)TemporaryRamBase; // We run on the primary core (and so we use the first stack)\r
+  SecCoreData.TemporaryRamSize       = TemporaryRamSize;\r
+  SecCoreData.PeiTemporaryRamBase    = SecCoreData.TemporaryRamBase;\r
   SecCoreData.PeiTemporaryRamSize    = SecCoreData.TemporaryRamSize / 2;\r
-  SecCoreData.StackBase              = SecCoreData.TemporaryRamBase;\r
-  SecCoreData.StackSize              = SecCoreData.TemporaryRamSize - SecCoreData.PeiTemporaryRamSize;\r
+  SecCoreData.StackBase              = (VOID *)((UINTN)(SecCoreData.TemporaryRamBase) + (SecCoreData.TemporaryRamSize/2));\r
+  SecCoreData.StackSize              = SecCoreData.TemporaryRamSize / 2;\r
 \r
-  // jump to pei core entry point\r
-  (PeiCoreEntryPoint)(&SecCoreData, (VOID *)&gSecPpiTable);\r
+  // Jump to PEI core entry point\r
+  (PeiCoreEntryPoint)(&SecCoreData, PpiList);\r
 }\r