diff options
| author | Leif Lindholm <leif.lindholm@linaro.org> | 2014-01-21 11:47:53 +0000 |
|---|---|---|
| committer | Leif Lindholm <leif.lindholm@linaro.org> | 2014-01-24 15:44:20 +0000 |
| commit | 48e2762bcd193e247e5998d64bd713053b43e2ea (patch) | |
| tree | 196858b104ee5b85589df7649b4bde5e72c1e8aa | |
| parent | 1c37091f46aa579303170b72d52a9ebd9e4e5986 (diff) | |
Fix build errors on Pandaboard
Updates to work with various API changes:
- ArmPkg/Drivers/PL390Gic renamed ArmGic
- PcdGet32 changed to PcdGet64
- ArmPlatformGetPrimaryCoreMpId implementation copied from
ArmPlatformLibNull.
Signed-off-by: Leif Lindholm <leif.lindholm@linaro.org>
| -rw-r--r-- | PandaBoardPkg/Library/PandaBoardLib/PandaBoardHelper.S | 10 | ||||
| -rwxr-xr-x | PandaBoardPkg/Library/PandaBoardLib/PandaBoardMem.c | 6 | ||||
| -rw-r--r-- | PandaBoardPkg/PandaBoardPkg.dsc | 5 | ||||
| -rw-r--r-- | PandaBoardPkg/PandaBoardPkg.fdf | 2 |
4 files changed, 16 insertions, 7 deletions
diff --git a/PandaBoardPkg/Library/PandaBoardLib/PandaBoardHelper.S b/PandaBoardPkg/Library/PandaBoardLib/PandaBoardHelper.S index 49fcf533a..6f21ed08a 100644 --- a/PandaBoardPkg/Library/PandaBoardLib/PandaBoardHelper.S +++ b/PandaBoardPkg/Library/PandaBoardLib/PandaBoardHelper.S @@ -25,6 +25,7 @@ GCC_ASM_EXPORT(ArmPlatformGetCorePosition) GCC_ASM_EXPORT(ArmPlatformIsPrimaryCore) GCC_ASM_EXPORT(ArmPlatformPeiBootAction) +GCC_ASM_EXPORT(ArmPlatformGetPrimaryCoreMpId) /** ArmPlatformPrePiBootAction @@ -117,3 +118,12 @@ ASM_PFX(ArmPlatformPeiBootAction): mov pc, lr ASM_FUNCTION_REMOVE_IF_UNREFERENCED + +//UINTN +//ArmPlatformGetPrimaryCoreMpId ( +// VOID +// ); +ASM_PFX(ArmPlatformGetPrimaryCoreMpId): + LoadConstantToReg (_gPcd_FixedAtBuild_PcdArmPrimaryCore, r0) + ldr r0, [r0] + bx lr diff --git a/PandaBoardPkg/Library/PandaBoardLib/PandaBoardMem.c b/PandaBoardPkg/Library/PandaBoardLib/PandaBoardMem.c index 334cb094e..fe082c2a6 100755 --- a/PandaBoardPkg/Library/PandaBoardLib/PandaBoardMem.c +++ b/PandaBoardPkg/Library/PandaBoardLib/PandaBoardMem.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 diff --git a/PandaBoardPkg/PandaBoardPkg.dsc b/PandaBoardPkg/PandaBoardPkg.dsc index 21a75cfb8..b6a9617fb 100644 --- a/PandaBoardPkg/PandaBoardPkg.dsc +++ b/PandaBoardPkg/PandaBoardPkg.dsc @@ -133,8 +133,7 @@ [LibraryClasses.common.SEC] ArmLib|ArmPkg/Library/ArmLib/ArmV7/ArmV7LibPrePi.inf ArmPlatformGlobalVariableLib|ArmPlatformPkg/Library/ArmPlatformGlobalVariableLib/PrePi/PrePiArmPlatformGlobalVariableLib.inf - ArmGicSecLib|ArmPkg/Drivers/PL390Gic/PL390GicLib.inf - ArmGicLib|ArmPkg/Drivers/PL390Gic/PL390GicLib.inf + ArmGicLib|ArmPkg/Drivers/ArmGic/ArmGicLib.inf PcdLib|MdePkg/Library/BasePcdLibNull/BasePcdLibNull.inf ReportStatusCodeLib|IntelFrameworkModulePkg/Library/PeiDxeDebugLibReportStatusCode/PeiDxeDebugLibReportStatusCode.inf @@ -409,7 +408,7 @@ } ArmPkg/Drivers/CpuDxe/CpuDxe.inf - ArmPkg/Drivers/PL390Gic/PL390GicDxe.inf + ArmPkg/Drivers/ArmGic/ArmGicDxe.inf MdeModulePkg/Core/RuntimeDxe/RuntimeDxe.inf MdeModulePkg/Universal/SecurityStubDxe/SecurityStubDxe.inf diff --git a/PandaBoardPkg/PandaBoardPkg.fdf b/PandaBoardPkg/PandaBoardPkg.fdf index 88881084f..d78dea9d3 100644 --- a/PandaBoardPkg/PandaBoardPkg.fdf +++ b/PandaBoardPkg/PandaBoardPkg.fdf @@ -96,7 +96,7 @@ READ_LOCK_STATUS = TRUE # PI DXE Drivers producing Architectural Protocols (EFI Services) # INF ArmPkg/Drivers/CpuDxe/CpuDxe.inf - INF ArmPkg/Drivers/PL390Gic/PL390GicDxe.inf + INF ArmPkg/Drivers/ArmGic/ArmGicDxe.inf INF MdeModulePkg/Core/RuntimeDxe/RuntimeDxe.inf INF MdeModulePkg/Universal/SecurityStubDxe/SecurityStubDxe.inf |