Merge branch 'master' of https://github.com/tianocore/edk2 into MemoryAttributeTable

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

diff --git a/ArmPlatformPkg/PrePi/MainUniCore.c b/ArmPlatformPkg/PrePi/MainUniCore.c
index e56697ca5088be6b164b83e2b0f083033c82539b..49b02338ebc2f44433649d69f177a34808040152 100644 (file)
--- a/ArmPlatformPkg/PrePi/MainUniCore.c
+++ b/ArmPlatformPkg/PrePi/MainUniCore.c
@@ -18,11 +18,15 @@ VOID
 PrimaryMain (\r
   IN  UINTN                     UefiMemoryBase,\r
   IN  UINTN                     StacksBase,\r
-  IN  UINTN                     GlobalVariableBase,\r
   IN  UINT64                    StartTimeStamp\r
   )\r
 {\r
-  PrePiMain (UefiMemoryBase, StacksBase, GlobalVariableBase, StartTimeStamp);\r
+  DEBUG_CODE_BEGIN();\r
+    // On MPCore system, PeiMpCore.inf should be used instead of PeiUniCore.inf\r
+    ASSERT(ArmIsMpCore() == 0);\r
+  DEBUG_CODE_END();\r
+\r
+  PrePiMain (UefiMemoryBase, StacksBase, StartTimeStamp);\r
 \r
   // We must never return\r
   ASSERT(FALSE);\r