[Linaro-uefi] Platforms/ARM/Juno: move to renamed PCI PCDs

Message ID 1461947514-6055-1-git-send-email-ard.biesheuvel@linaro.org
State Accepted
Commit 6cb86aa436952dd5857e85a4ca7072b9f3411ae0
Headers show

Commit Message

Ard Biesheuvel April 29, 2016, 4:31 p.m.
Use the new PCI related PCD names after they have been moved from
ArmPlatformPkg to ArmPkg

Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>
---
 Platforms/ARM/Juno/ArmJuno.dsc | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

Comments

Leif Lindholm April 29, 2016, 8:26 p.m. | #1
On Fri, Apr 29, 2016 at 06:31:54PM +0200, Ard Biesheuvel wrote:
> Use the new PCI related PCD names after they have been moved from
> ArmPlatformPkg to ArmPkg
> 
> Contributed-under: TianoCore Contribution Agreement 1.0
> Signed-off-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>

Pushed, thanks.

> ---
>  Platforms/ARM/Juno/ArmJuno.dsc | 14 +++++++-------
>  1 file changed, 7 insertions(+), 7 deletions(-)
> 
> diff --git a/Platforms/ARM/Juno/ArmJuno.dsc b/Platforms/ARM/Juno/ArmJuno.dsc
> index fbf09c220b8e..4f08e80d1483 100644
> --- a/Platforms/ARM/Juno/ArmJuno.dsc
> +++ b/Platforms/ARM/Juno/ArmJuno.dsc
> @@ -140,13 +140,13 @@
>    #
>    # PLDA PCI Root Complex
>    #
> -  gArmPlatformTokenSpaceGuid.PcdPciBusMax|255
> -  gArmPlatformTokenSpaceGuid.PcdPciIoBase|0x5f800000
> -  gArmPlatformTokenSpaceGuid.PcdPciIoSize|0x00800000
> -  gArmPlatformTokenSpaceGuid.PcdPciMmio32Base|0x50000000
> -  gArmPlatformTokenSpaceGuid.PcdPciMmio32Size|0x08000000
> -  gArmPlatformTokenSpaceGuid.PcdPciMmio64Base|0x4000000000
> -  gArmPlatformTokenSpaceGuid.PcdPciMmio64Size|0x100000000
> +  gArmTokenSpaceGuid.PcdPciBusMax|255
> +  gArmTokenSpaceGuid.PcdPciIoBase|0x5f800000
> +  gArmTokenSpaceGuid.PcdPciIoSize|0x00800000
> +  gArmTokenSpaceGuid.PcdPciMmio32Base|0x50000000
> +  gArmTokenSpaceGuid.PcdPciMmio32Size|0x08000000
> +  gArmTokenSpaceGuid.PcdPciMmio64Base|0x4000000000
> +  gArmTokenSpaceGuid.PcdPciMmio64Size|0x100000000
>  
>    # List of Device Paths that support BootMonFs
>    gArmPlatformTokenSpaceGuid.PcdBootMonFsSupportedDevicePaths|L"VenHw(E7223039-5836-41E1-B542-D7EC736C5E59)"
> -- 
> 2.7.4
>

Patch

diff --git a/Platforms/ARM/Juno/ArmJuno.dsc b/Platforms/ARM/Juno/ArmJuno.dsc
index fbf09c220b8e..4f08e80d1483 100644
--- a/Platforms/ARM/Juno/ArmJuno.dsc
+++ b/Platforms/ARM/Juno/ArmJuno.dsc
@@ -140,13 +140,13 @@ 
   #
   # PLDA PCI Root Complex
   #
-  gArmPlatformTokenSpaceGuid.PcdPciBusMax|255
-  gArmPlatformTokenSpaceGuid.PcdPciIoBase|0x5f800000
-  gArmPlatformTokenSpaceGuid.PcdPciIoSize|0x00800000
-  gArmPlatformTokenSpaceGuid.PcdPciMmio32Base|0x50000000
-  gArmPlatformTokenSpaceGuid.PcdPciMmio32Size|0x08000000
-  gArmPlatformTokenSpaceGuid.PcdPciMmio64Base|0x4000000000
-  gArmPlatformTokenSpaceGuid.PcdPciMmio64Size|0x100000000
+  gArmTokenSpaceGuid.PcdPciBusMax|255
+  gArmTokenSpaceGuid.PcdPciIoBase|0x5f800000
+  gArmTokenSpaceGuid.PcdPciIoSize|0x00800000
+  gArmTokenSpaceGuid.PcdPciMmio32Base|0x50000000
+  gArmTokenSpaceGuid.PcdPciMmio32Size|0x08000000
+  gArmTokenSpaceGuid.PcdPciMmio64Base|0x4000000000
+  gArmTokenSpaceGuid.PcdPciMmio64Size|0x100000000
 
   # List of Device Paths that support BootMonFs
   gArmPlatformTokenSpaceGuid.PcdBootMonFsSupportedDevicePaths|L"VenHw(E7223039-5836-41E1-B542-D7EC736C5E59)"