Merging uefi-next/linaro-release into masterHEADlinaro-uefi-2014.01master

Signed-off-by: Leif Lindholm <leif.lindholm@linaro.org>

1 files changed, 13 insertions, 0 deletions

diff --git a/BeagleBoardPkg/Library/BeagleBoardLib/BeagleBoardHelper.asm b/BeagleBoardPkg/Library/BeagleBoardLib/BeagleBoardHelper.asm
index a05747717..b850d9858 100644
--- a/BeagleBoardPkg/Library/BeagleBoardLib/BeagleBoardHelper.asm
+++ b/BeagleBoardPkg/Library/BeagleBoardLib/BeagleBoardHelper.asm
@@ -20,6 +20,9 @@
 

   EXPORT    ArmPlatformPeiBootAction

   EXPORT    ArmPlatformIsPrimaryCore

+  EXPORT    ArmPlatformGetPrimaryCoreMpId

+

+  IMPORT	ArmReadMpidr

 

   AREA BeagleBoardHelper, CODE, READONLY

 

@@ -37,4 +40,14 @@ ArmPlatformPeiBootAction FUNCTION
   bx    lr

   ENDFUNC

 

+//UINTN

+//ArmPlatformGetPrimaryCoreMpId (

+//  VOID

+//  );

+ArmPlatformGetPrimaryCoreMpId FUNCTION

+  // The BeagleBoard is a uniprocessor platform. The MPIDR of primary core is

+  // always the MPIDR of the calling CPU.

+  b		ArmReadMpidr

+  ENDFUNC

+

   END