diff options
author | Leif Lindholm <leif.lindholm@linaro.org> | 2014-01-24 17:18:26 +0000 |
---|---|---|
committer | Leif Lindholm <leif.lindholm@linaro.org> | 2014-01-24 17:18:26 +0000 |
commit | e1e57aa891deef00276b26a4569802a5cd13ce92 (patch) | |
tree | 9061825c6c9f5c8bed33d5b2087101ce38f23fdf /BeagleBoardPkg | |
parent | 18110e987bb049e24ade0fb63b5577def8f99114 (diff) | |
parent | 04d965c0713468e055ef328f9f49903bc5944e54 (diff) |
Merging uefi-next/linaro-release into masterHEADlinaro-uefi-2014.01master
Signed-off-by: Leif Lindholm <leif.lindholm@linaro.org>
Diffstat (limited to 'BeagleBoardPkg')
3 files changed, 28 insertions, 3 deletions
diff --git a/BeagleBoardPkg/Library/BeagleBoardLib/BeagleBoardHelper.S b/BeagleBoardPkg/Library/BeagleBoardLib/BeagleBoardHelper.S index 1d0b09077..0d50cbd45 100644 --- a/BeagleBoardPkg/Library/BeagleBoardLib/BeagleBoardHelper.S +++ b/BeagleBoardPkg/Library/BeagleBoardLib/BeagleBoardHelper.S @@ -18,8 +18,11 @@ .align 2
GCC_ASM_EXPORT(ArmPlatformIsPrimaryCore)
+GCC_ASM_EXPORT(ArmPlatformGetPrimaryCoreMpId)
GCC_ASM_EXPORT(ArmPlatformPeiBootAction)
+GCC_ASM_IMPORT(ArmReadMpidr)
+
//UINTN
//ArmPlatformIsPrimaryCore (
// IN UINTN MpId
@@ -32,4 +35,13 @@ ASM_PFX(ArmPlatformIsPrimaryCore): ASM_PFX(ArmPlatformPeiBootAction):
bx lr
+//UINTN
+//ArmPlatformGetPrimaryCoreMpId (
+// VOID
+// );
+ASM_PFX(ArmPlatformGetPrimaryCoreMpId):
+ // The BeagleBoard is a uniprocessor platform. The MPIDR of primary core is
+ // always the MPIDR of the calling CPU.
+ b ASM_PFX(ArmReadMpidr)
+
ASM_FUNCTION_REMOVE_IF_UNREFERENCED
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
diff --git a/BeagleBoardPkg/Library/BeagleBoardLib/BeagleBoardMem.c b/BeagleBoardPkg/Library/BeagleBoardLib/BeagleBoardMem.c index 5524ddbca..210e850c8 100755 --- a/BeagleBoardPkg/Library/BeagleBoardLib/BeagleBoardMem.c +++ b/BeagleBoardPkg/Library/BeagleBoardLib/BeagleBoardMem.c @@ -55,9 +55,9 @@ ArmPlatformGetVirtualMemoryMap ( }
// ReMap (Either NOR Flash or DRAM)
- VirtualMemoryTable[Index].PhysicalBase = PcdGet32(PcdSystemMemoryBase);
- VirtualMemoryTable[Index].VirtualBase = PcdGet32(PcdSystemMemoryBase);
- VirtualMemoryTable[Index].Length = PcdGet32(PcdSystemMemorySize);
+ VirtualMemoryTable[Index].PhysicalBase = PcdGet64 (PcdSystemMemoryBase);
+ VirtualMemoryTable[Index].VirtualBase = PcdGet64 (PcdSystemMemoryBase);
+ VirtualMemoryTable[Index].Length = PcdGet64 (PcdSystemMemorySize);
VirtualMemoryTable[Index].Attributes = CacheAttributes;
// SOC Registers. L3 interconnects
|