panda: rebase to latest uefi-next tree

rebase to commit 67154aa040304dd7b32471f32f3b0f2d4dfbb984 in uefi-next git
tree in armlt-tracking

4 files changed, 32 insertions, 6 deletions

diff --git a/PandaBoardPkg/Library/PandaBoardLib/PandaBoard.c b/PandaBoardPkg/Library/PandaBoardLib/PandaBoard.c
index d679b14dc..c04fc6af6 100755..100644
--- a/PandaBoardPkg/Library/PandaBoardLib/PandaBoard.c
+++ b/PandaBoardPkg/Library/PandaBoardLib/PandaBoard.c
@@ -119,9 +119,9 @@ ArmPlatformGetBootMode (
   For example, some L2x0 requires to be initialized in Secure World
 
 **/
-VOID
-ArmPlatformNormalInitialize (
-  VOID
+RETURN_STATUS
+ArmPlatformInitialize (
+  IN  UINTN                     MpId
   )
 {
 #if 0
@@ -148,6 +148,7 @@ ArmPlatformNormalInitialize (
   // Not doing so makes gpmc_init hang early in kernel init
   MmioAnd32 (GPMC_CONFIG7_0, ~CSVALID);
 
+  return RETURN_SUCCESS;
 }
 
 /**
@@ -198,3 +199,18 @@ ArmPlatformGetPlatformPpiList (
   *PpiListSize = sizeof(gPlatformPpiTable);
   *PpiList = gPlatformPpiTable;
 }
+
+/**
+  Initialize the Secure peripherals and memory regions
+
+  If Trustzone is supported by your platform then this function makes the required initialization
+  of the secure peripherals and memory regions.
+
+**/
+VOID
+ArmPlatformSecTrustzoneInit (
+  IN  UINTN                     MpId
+  )
+{
+}
+
diff --git a/PandaBoardPkg/Library/PandaBoardLib/PandaBoardHelper.S b/PandaBoardPkg/Library/PandaBoardLib/PandaBoardHelper.S
index 7848a1bf9..26624b80f 100755..100644
--- a/PandaBoardPkg/Library/PandaBoardLib/PandaBoardHelper.S
+++ b/PandaBoardPkg/Library/PandaBoardLib/PandaBoardHelper.S
@@ -22,6 +22,7 @@
 
 GCC_ASM_EXPORT(ArmPlatformIsBootMemoryInitialized)
 GCC_ASM_EXPORT(ArmPlatformInitializeBootMemory)
+GCC_ASM_EXPORT(ArmPlatformGetCorePosition)
 
 /**
   Called at the early stage of the Boot phase to know if the memory has already been initialized
@@ -54,4 +55,12 @@ ASM_PFX(ArmPlatformInitializeBootMemory):
   // We must need to go into this function
   bx    lr
 
+
+//UINTN
+//ArmPlatformGetCorePosition (
+//  IN UINTN MpId
+//  );
+ASM_PFX(ArmPlatformGetCorePosition):
+  bx    lr
+
 ASM_FUNCTION_REMOVE_IF_UNREFERENCED
diff --git a/PandaBoardPkg/PandaBoardPkg.dsc b/PandaBoardPkg/PandaBoardPkg.dsc
index 12d898df4..fc62a5819 100644
--- a/PandaBoardPkg/PandaBoardPkg.dsc
+++ b/PandaBoardPkg/PandaBoardPkg.dsc
@@ -34,6 +34,7 @@
   ArmLib|ArmPkg/Library/ArmLib/ArmV7/ArmV7Lib.inf
   ArmPlatformLib|PandaBoardPkg/Library/PandaBoardLib/PandaBoardLib.inf
   ArmCpuLib|ArmPkg/Drivers/ArmCpuLib/ArmCortexA9Lib/ArmCortexA9Lib.inf
+  ArmPlatformStackLib|ArmPlatformPkg/Library/ArmPlatformStackLib/ArmPlatformStackLib.inf
   
   HiiLib|MdeModulePkg/Library/UefiHiiLib/UefiHiiLib.inf
   UefiHiiServicesLib|MdeModulePkg/Library/UefiHiiServicesLib/UefiHiiServicesLib.inf
@@ -79,7 +80,7 @@
   
   CacheMaintenanceLib|ArmPkg/Library/ArmCacheMaintenanceLib/ArmCacheMaintenanceLib.inf
   DefaultExceptionHandlerLib|ArmPkg/Library/DefaultExceptionHandlerLib/DefaultExceptionHandlerLib.inf
-  #CpuExceptionHandlerLib|MdeModulePkg/Library/CpuExceptionHandlerLibNull/CpuExceptionHandlerLibNull.inf
+  CpuExceptionHandlerLib|MdeModulePkg/Library/CpuExceptionHandlerLibNull/CpuExceptionHandlerLibNull.inf
   PrePiLib|EmbeddedPkg/Library/PrePiLib/PrePiLib.inf
   
   SerialPortLib|Omap44xxPkg/Library/SerialPortLib/SerialPortLib.inf
@@ -261,6 +262,7 @@
   gEmbeddedTokenSpaceGuid.PcdEmbeddedPrompt|"PandaEdk2"
   gEmbeddedTokenSpaceGuid.PcdPrePiCpuMemorySize|32
   gEmbeddedTokenSpaceGuid.PcdPrePiCpuIoSize|0
+  gArmPlatformTokenSpaceGuid.PcdCoreCount|4
   gEfiMdePkgTokenSpaceGuid.PcdMaximumUnicodeStringLength|1000000
   gEfiMdePkgTokenSpaceGuid.PcdMaximumAsciiStringLength|1000000
   gEfiMdePkgTokenSpaceGuid.PcdMaximumLinkedListLength|1000000
@@ -339,7 +341,6 @@
   # ARM Gic base addresses
   gArmTokenSpaceGuid.PcdGicDistributorBase|0x48241000
   gArmTokenSpaceGuid.PcdGicInterruptInterfaceBase|0x48240100
-  gArmTokenSpaceGuid.PcdGicNumInterrupts|160
   
   gEmbeddedTokenSpaceGuid.PcdMemoryBase|0x80000000
   gEmbeddedTokenSpaceGuid.PcdMemorySize|0x08000000
diff --git a/PandaBoardPkg/PandaBoardPkg.fdf b/PandaBoardPkg/PandaBoardPkg.fdf
index 6c0bf824e..4b86f6957 100644
--- a/PandaBoardPkg/PandaBoardPkg.fdf
+++ b/PandaBoardPkg/PandaBoardPkg.fdf
@@ -56,7 +56,7 @@ NumBlocks     = 0x80000
 
 0x00000208|0x0007FDF8
 !endif
-gArmTokenSpaceGuid.PcdFvBaseAddress|gArmTokenSpaceGuid.PcdFvBaseSize
+gArmTokenSpaceGuid.PcdFvBaseAddress|gArmTokenSpaceGuid.PcdFvSize
 FV = FVMAIN_COMPACT
 
 ################################################################################