ArmPlatformPkg: Increase more ARM address Pcd entries to 64-bit.

Some AArch64 platforms have RAM and flash devices >4GB.
Update some additional Pcd entries to 64-bit, and change
the corresponding PcdGet32 calls to PcdGet64.

Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Leif Lindholm <leif.lindholm@linaro.org>
Signed-off-by: Olivier Martin <olivier.martin@arm.com>



git-svn-id: https://svn.code.sf.net/p/edk2/code/trunk/edk2@16325 6f19259b-4bc3-4df7-8a09-765794883524

3 files changed, 6 insertions, 6 deletions

diff --git a/ArmPlatformPkg/PrePeiCore/MainMPCore.c b/ArmPlatformPkg/PrePeiCore/MainMPCore.c
index d40594f835..a86f739fd1 100644
--- a/ArmPlatformPkg/PrePeiCore/MainMPCore.c
+++ b/ArmPlatformPkg/PrePeiCore/MainMPCore.c
@@ -131,7 +131,7 @@ PrimaryMain (
   // Adjust the Temporary Ram as the new Ppi List (Common + Platform Ppi Lists) is created at

   // the base of the primary core stack

   PpiListSize = ALIGN_VALUE(PpiListSize, 0x4);

-  TemporaryRamBase = (UINTN)PcdGet32 (PcdCPUCoresStackBase) + PpiListSize;

+  TemporaryRamBase = (UINTN)PcdGet64 (PcdCPUCoresStackBase) + PpiListSize;

   TemporaryRamSize = (UINTN)PcdGet32 (PcdCPUCorePrimaryStackSize) - PpiListSize;

 

   // Make sure the size is 8-byte aligned. Once divided by 2, the size should be 4-byte aligned

@@ -144,7 +144,7 @@ PrimaryMain (
   // Note also:  HOBs (pei temp ram) MUST be above stack

   //

   SecCoreData.DataSize               = sizeof(EFI_SEC_PEI_HAND_OFF);

-  SecCoreData.BootFirmwareVolumeBase = (VOID *)(UINTN)PcdGet32 (PcdFvBaseAddress);

+  SecCoreData.BootFirmwareVolumeBase = (VOID *)(UINTN)PcdGet64 (PcdFvBaseAddress);

   SecCoreData.BootFirmwareVolumeSize = PcdGet32 (PcdFvSize);

   SecCoreData.TemporaryRamBase       = (VOID *)TemporaryRamBase; // We run on the primary core (and so we use the first stack)

   SecCoreData.TemporaryRamSize       = TemporaryRamSize;

diff --git a/ArmPlatformPkg/PrePeiCore/MainUniCore.c b/ArmPlatformPkg/PrePeiCore/MainUniCore.c
index b437ad6510..6317f178ca 100644
--- a/ArmPlatformPkg/PrePeiCore/MainUniCore.c
+++ b/ArmPlatformPkg/PrePeiCore/MainUniCore.c
@@ -40,7 +40,7 @@ PrimaryMain (
   // Adjust the Temporary Ram as the new Ppi List (Common + Platform Ppi Lists) is created at

   // the base of the primary core stack

   PpiListSize = ALIGN_VALUE(PpiListSize, 0x4);

-  TemporaryRamBase = (UINTN)PcdGet32 (PcdCPUCoresStackBase) + PpiListSize;

+  TemporaryRamBase = (UINTN)PcdGet64 (PcdCPUCoresStackBase) + PpiListSize;

   TemporaryRamSize = (UINTN)PcdGet32 (PcdCPUCorePrimaryStackSize) - PpiListSize;

 

   // Make sure the size is 8-byte aligned. Once divided by 2, the size should be 4-byte aligned

@@ -53,7 +53,7 @@ PrimaryMain (
   // Note also:  HOBs (pei temp ram) MUST be above stack

   //

   SecCoreData.DataSize               = sizeof(EFI_SEC_PEI_HAND_OFF);

-  SecCoreData.BootFirmwareVolumeBase = (VOID *)(UINTN)PcdGet32 (PcdFvBaseAddress);

+  SecCoreData.BootFirmwareVolumeBase = (VOID *)(UINTN)PcdGet64 (PcdFvBaseAddress);

   SecCoreData.BootFirmwareVolumeSize = PcdGet32 (PcdFvSize);

   SecCoreData.TemporaryRamBase       = (VOID *)TemporaryRamBase; // We run on the primary core (and so we use the first stack)

   SecCoreData.TemporaryRamSize       = TemporaryRamSize;

diff --git a/ArmPlatformPkg/PrePeiCore/PrePeiCore.c b/ArmPlatformPkg/PrePeiCore/PrePeiCore.c
index 93d7e1c4c0..43ae40de2f 100644
--- a/ArmPlatformPkg/PrePeiCore/PrePeiCore.c
+++ b/ArmPlatformPkg/PrePeiCore/PrePeiCore.c
@@ -53,7 +53,7 @@ CreatePpiList (
   ArmPlatformGetPlatformPpiList (&PlatformPpiListSize, &PlatformPpiList);

 

   // Copy the Common and Platform PPis in Temporrary Memory

-  ListBase = PcdGet32 (PcdCPUCoresStackBase);

+  ListBase = PcdGet64 (PcdCPUCoresStackBase);

   CopyMem ((VOID*)ListBase, gCommonPpiTable, sizeof(gCommonPpiTable));

   CopyMem ((VOID*)(ListBase + sizeof(gCommonPpiTable)), PlatformPpiList, PlatformPpiListSize);

 

@@ -154,7 +154,7 @@ PrePeiCoreGetGlobalVariableMemory (
 {

   ASSERT (GlobalVariableBase != NULL);

 

-  *GlobalVariableBase = (UINTN)PcdGet32 (PcdCPUCoresStackBase) +

+  *GlobalVariableBase = (UINTN)PcdGet64 (PcdCPUCoresStackBase) +

                         (UINTN)PcdGet32 (PcdCPUCorePrimaryStackSize) -

                         (UINTN)PcdGet32 (PcdPeiGlobalVariableSize);