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 f1dff8af37916bb731789856f2533025a2cff098..49b02338ebc2f44433649d69f177a34808040152 100644 (file)
--- a/ArmPlatformPkg/PrePi/MainUniCore.c
+++ b/ArmPlatformPkg/PrePi/MainUniCore.c
@@ -17,10 +17,16 @@
 VOID\r
 PrimaryMain (\r
   IN  UINTN                     UefiMemoryBase,\r
+  IN  UINTN                     StacksBase,\r
   IN  UINT64                    StartTimeStamp\r
   )\r
 {\r
-  PrePiMain (UefiMemoryBase, 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