ArmPlatformPkg: Fix warnings

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

2 files changed, 9 insertions, 4 deletions

diff --git a/ArmPlatformPkg/Library/DebugSecExtraActionLib/DebugSecExtraActionLib.c b/ArmPlatformPkg/Library/DebugSecExtraActionLib/DebugSecExtraActionLib.c
index 2d9595f88..469a545c0 100755
--- a/ArmPlatformPkg/Library/DebugSecExtraActionLib/DebugSecExtraActionLib.c
+++ b/ArmPlatformPkg/Library/DebugSecExtraActionLib/DebugSecExtraActionLib.c
@@ -18,7 +18,7 @@
 #include <Library/PcdLib.h>

 #include <Library/PrintLib.h>

 #include <Library/SerialPortLib.h>

-

+#include <Chipset/ArmV7.h>
 #include <Drivers/PL390Gic.h>

 

 #define ARM_PRIMARY_CORE    0

diff --git a/ArmPlatformPkg/PrePi/PrePi.c b/ArmPlatformPkg/PrePi/PrePi.c
index 5a88b47fe..a1c1c443f 100755
--- a/ArmPlatformPkg/PrePi/PrePi.c
+++ b/ArmPlatformPkg/PrePi/PrePi.c
@@ -76,12 +76,15 @@ PrePiMain (
   InitializeDebugAgent (DEBUG_AGENT_INIT_POSTMEM_SEC, NULL, NULL);

   SaveAndSetDebugTimerInterrupt (TRUE);

 

-  PrePiHobBase = (EFI_HOB_HANDOFF_INFO_TABLE**)(PcdGet32 (PcdCPUCoresNonSecStackBase) + (PcdGet32 (PcdCPUCoresNonSecStackSize) / 2) - PcdGet32 (PcdHobListPtrGlobalOffset));

-

   UefiMemoryTop = UefiMemoryBase + FixedPcdGet32 (PcdSystemMemoryUefiRegionSize);

   StacksSize = PcdGet32 (PcdCPUCoresNonSecStackSize) * PcdGet32 (PcdMPCoreMaxCores);

   StacksBase = UefiMemoryTop - StacksSize;

 

+  // Check the PcdCPUCoresNonSecStackBase match with the calculated StackBase

+  ASSERT (StacksBase == PcdGet32 (PcdCPUCoresNonSecStackBase));

+  

+  PrePiHobBase = (EFI_HOB_HANDOFF_INFO_TABLE**)(PcdGet32 (PcdCPUCoresNonSecStackBase) + (PcdGet32 (PcdCPUCoresNonSecStackSize) / 2) - PcdGet32 (PcdHobListPtrGlobalOffset));

+

   // Declare the PI/UEFI memory region

   *PrePiHobBase = HobConstructor (

     (VOID*)UefiMemoryBase,

@@ -140,12 +143,14 @@ CEntryPoint (
   )

 {

   UINT64   StartTimeStamp;

-

+ 

   if ((CoreId == ARM_PRIMARY_CORE) && PerformanceMeasurementEnabled ()) {

     // Initialize the Timer Library to setup the Timer HW controller

     TimerConstructor ();

     // We cannot call yet the PerformanceLib because the HOB List has not been initialized

     StartTimeStamp = GetPerformanceCounter ();

+  } else {

+    StartTimeStamp = 0;

   }

 

   // Clean Data cache