ArmPlatformPkg: Fix warnings

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@12001 6f19259b-4bc3-4df7-8a09-765794883524

diff --git a/ArmPlatformPkg/Library/DebugSecExtraActionLib/DebugSecExtraActionLib.c b/ArmPlatformPkg/Library/DebugSecExtraActionLib/DebugSecExtraActionLib.c
index 2d9595f8850915c972df0d74f8487f72a58b5c5e..469a545c0e9f21c44239fa1850208fb09e7a2970 100755 (executable)
--- a/ArmPlatformPkg/Library/DebugSecExtraActionLib/DebugSecExtraActionLib.c
+++ b/ArmPlatformPkg/Library/DebugSecExtraActionLib/DebugSecExtraActionLib.c
@@ -18,7 +18,7 @@
 #include <Library/PcdLib.h>\r
 #include <Library/PrintLib.h>\r
 #include <Library/SerialPortLib.h>\r
-\r
+#include <Chipset/ArmV7.h>
 #include <Drivers/PL390Gic.h>\r
 \r
 #define ARM_PRIMARY_CORE    0\r

diff --git a/ArmPlatformPkg/PrePi/PrePi.c b/ArmPlatformPkg/PrePi/PrePi.c
index 5a88b47fe92d0d52c24a25a03a7e2f768a2ce20a..a1c1c443f0cefb2fb4d95db31d68e43edb735569 100755 (executable)
--- a/ArmPlatformPkg/PrePi/PrePi.c
+++ b/ArmPlatformPkg/PrePi/PrePi.c
@@ -76,12 +76,15 @@ PrePiMain (
   InitializeDebugAgent (DEBUG_AGENT_INIT_POSTMEM_SEC, NULL, NULL);\r
   SaveAndSetDebugTimerInterrupt (TRUE);\r
 \r
-  PrePiHobBase = (EFI_HOB_HANDOFF_INFO_TABLE**)(PcdGet32 (PcdCPUCoresNonSecStackBase) + (PcdGet32 (PcdCPUCoresNonSecStackSize) / 2) - PcdGet32 (PcdHobListPtrGlobalOffset));\r
-\r
   UefiMemoryTop = UefiMemoryBase + FixedPcdGet32 (PcdSystemMemoryUefiRegionSize);\r
   StacksSize = PcdGet32 (PcdCPUCoresNonSecStackSize) * PcdGet32 (PcdMPCoreMaxCores);\r
   StacksBase = UefiMemoryTop - StacksSize;\r
 \r
+  // 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
     (VOID*)UefiMemoryBase,\r
@@ -140,12 +143,14 @@ CEntryPoint (
   )\r
 {\r
   UINT64   StartTimeStamp;\r
-\r
+ \r
   if ((CoreId == ARM_PRIMARY_CORE) && PerformanceMeasurementEnabled ()) {\r
     // Initialize the Timer Library to setup the Timer HW controller\r
     TimerConstructor ();\r
     // We cannot call yet the PerformanceLib because the HOB List has not been initialized\r
     StartTimeStamp = GetPerformanceCounter ();\r
+  } else {\r
+    StartTimeStamp = 0;\r
   }\r
 \r
   // Clean Data cache\r