ArmPlatformPkg: Renamed and Invoked earlier ArmPlatformNormalInitialize()

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

diff --git a/ArmPlatformPkg/PrePi/PrePi.c b/ArmPlatformPkg/PrePi/PrePi.c
index eba8750a41f7a018c71b9ec26279e743134dedb1..f3cb3a121f90b657ccc452ab96c1a51dd944be5f 100755 (executable)
--- a/ArmPlatformPkg/PrePi/PrePi.c
+++ b/ArmPlatformPkg/PrePi/PrePi.c
@@ -1,6 +1,6 @@
 /** @file\r
 *\r
-*  Copyright (c) 2011, ARM Limited. All rights reserved.\r
+*  Copyright (c) 2011-2012, ARM Limited. All rights reserved.\r
 *\r
 *  This program and the accompanying materials\r
 *  are licensed and made available under the terms and conditions of the BSD License\r
@@ -99,7 +99,8 @@ PrePiMain (
 \r
   // Initialize the Serial Port\r
   SerialPortInitialize ();\r
-  CharCount = AsciiSPrint (Buffer,sizeof (Buffer),"UEFI firmware built at %a on %a\n\r",__TIME__, __DATE__);\r
+  CharCount = AsciiSPrint (Buffer,sizeof (Buffer),"UEFI firmware (version %s built at %a on %a)\n\r",\r
+    (CHAR16*)PcdGetPtr(PcdFirmwareVersionString), __TIME__, __DATE__);\r
   SerialPortWrite ((UINT8 *) Buffer, CharCount);\r
 \r
   // Initialize the Debug Agent for Source Level Debugging\r
@@ -174,6 +175,9 @@ CEntryPoint (
 {\r
   UINT64   StartTimeStamp;\r
  \r
+  // Initialize the platform specific controllers\r
+  ArmPlatformInitialize (MpId);\r
+\r
   if (IS_PRIMARY_CORE(MpId) && PerformanceMeasurementEnabled ()) {\r
     // Initialize the Timer Library to setup the Timer HW controller\r
     TimerConstructor ();\r
@@ -199,10 +203,12 @@ CEntryPoint (
   if (!IS_XIP()) {\r
     if (IS_PRIMARY_CORE(MpId)) {\r
       mGlobalVariableBase = GlobalVariableBase;\r
-      ArmCpuSynchronizeSignal (ARM_CPU_EVENT_DEFAULT);\r
+      if (ArmIsMpCore()) {\r
+        ArmCpuSynchronizeSignal (ARM_CPU_EVENT_DEFAULT);\r
+      }\r
     } else {\r
-         // Wait the Primay core has defined the address of the Global Variable region\r
-         ArmCpuSynchronizeWait (ARM_CPU_EVENT_DEFAULT);\r
+      // Wait the Primay core has defined the address of the Global Variable region\r
+      ArmCpuSynchronizeWait (ARM_CPU_EVENT_DEFAULT);\r
     }\r
   }\r
   \r