3 files changed, 11 insertions, 9 deletions
diff --git a/ArmPlatformPkg/ArmJunoPkg/ArmJuno.dec b/ArmPlatformPkg/ArmJunoPkg/ArmJuno.dec
index 2ce207ef30..8f77cd7b38 100644
--- a/ArmPlatformPkg/ArmJunoPkg/ArmJuno.dec
+++ b/ArmPlatformPkg/ArmJunoPkg/ArmJuno.dec
@@ -36,5 +36,6 @@
   gArmJunoTokenSpaceGuid.PcdSynopsysUsbEhciBaseAddress|0x7FFC0000|UINT32|0x00000005
 
   # Juno Device Trees are loaded from NOR Flash
-  gArmJunoTokenSpaceGuid.PcdR0FdtDevicePath|L"VenHw(E7223039-5836-41E1-B542-D7EC736C5E59)/juno_r0.dtb"|VOID*|0x00000006
-  gArmJunoTokenSpaceGuid.PcdR1FdtDevicePath|L"VenHw(E7223039-5836-41E1-B542-D7EC736C5E59)/juno_r1.dtb"|VOID*|0x00000007
+  gArmJunoTokenSpaceGuid.PcdJunoR0FdtDevicePath|L"VenHw(E7223039-5836-41E1-B542-D7EC736C5E59)/juno-r0.dtb"|VOID*|0x00000006
+  gArmJunoTokenSpaceGuid.PcdJunoR1A57x2FdtDevicePath|L"VenHw(E7223039-5836-41E1-B542-D7EC736C5E59)/juno-r1-ca57x2.dtb"|VOID*|0x00000007
+  gArmJunoTokenSpaceGuid.PcdJunoR1A57x2A53x4FdtDevicePath|L"VenHw(E7223039-5836-41E1-B542-D7EC736C5E59)/juno-r1-ca57x2_ca53x4.dtb"|VOID*|0x00000008
diff --git a/ArmPlatformPkg/ArmJunoPkg/Drivers/ArmJunoDxe/ArmJunoDxe.c b/ArmPlatformPkg/ArmJunoPkg/Drivers/ArmJunoDxe/ArmJunoDxe.c
index 2d41cd2ee1..4b91f1ee06 100644
--- a/ArmPlatformPkg/ArmJunoPkg/Drivers/ArmJunoDxe/ArmJunoDxe.c
+++ b/ArmPlatformPkg/ArmJunoPkg/Drivers/ArmJunoDxe/ArmJunoDxe.c
@@ -97,17 +97,17 @@ ArmJunoEntryPoint (
   switch (CpuType) {
   case ARM_CPU_TYPE_A53:
     if (CpuRev == ARM_CPU_REV (0, 0)) {
-      TextDevicePath = (CHAR16*)FixedPcdGetPtr (PcdR0FdtDevicePath);
+      TextDevicePath = (CHAR16*)FixedPcdGetPtr (PcdJunoR0FdtDevicePath);
     } else if (CpuRev == ARM_CPU_REV (0, 3)) {
-      TextDevicePath = (CHAR16*)FixedPcdGetPtr (PcdR1FdtDevicePath);
+      TextDevicePath = (CHAR16*)FixedPcdGetPtr (PcdJunoR1A57x2FdtDevicePath);
     }
     break;
 
   case ARM_CPU_TYPE_A57:
     if (CpuRev == ARM_CPU_REV (0, 0)) {
-      TextDevicePath = (CHAR16*)FixedPcdGetPtr (PcdR0FdtDevicePath);
+      TextDevicePath = (CHAR16*)FixedPcdGetPtr (PcdJunoR0FdtDevicePath);
     } else if (CpuRev == ARM_CPU_REV (1, 1)) {
-      TextDevicePath = (CHAR16*)FixedPcdGetPtr (PcdR1FdtDevicePath);
+      TextDevicePath = (CHAR16*)FixedPcdGetPtr (PcdJunoR1A57x2FdtDevicePath);
     }
   }
 
diff --git a/ArmPlatformPkg/ArmJunoPkg/Drivers/ArmJunoDxe/ArmJunoDxe.inf b/ArmPlatformPkg/ArmJunoPkg/Drivers/ArmJunoDxe/ArmJunoDxe.inf
index 323ed5f49d..370edcb7c8 100644
--- a/ArmPlatformPkg/ArmJunoPkg/Drivers/ArmJunoDxe/ArmJunoDxe.inf
+++ b/ArmPlatformPkg/ArmJunoPkg/Drivers/ArmJunoDxe/ArmJunoDxe.inf
@@ -1,5 +1,5 @@
 #
-#  Copyright (c) 2013-2014, ARM Limited. All rights reserved.
+#  Copyright (c) 2013-2015, ARM Limited. All rights reserved.
 #
 #  This program and the accompanying materials
 #  are licensed and made available under the terms and conditions of the BSD License
@@ -69,8 +69,9 @@
   gArmJunoTokenSpaceGuid.PcdSynopsysUsbEhciBaseAddress
   gArmJunoTokenSpaceGuid.PcdSynopsysUsbOhciBaseAddress
 
-  gArmJunoTokenSpaceGuid.PcdR0FdtDevicePath
-  gArmJunoTokenSpaceGuid.PcdR1FdtDevicePath
+  gArmJunoTokenSpaceGuid.PcdJunoR0FdtDevicePath
+  gArmJunoTokenSpaceGuid.PcdJunoR1A57x2FdtDevicePath
+  gArmJunoTokenSpaceGuid.PcdJunoR1A57x2A53x4FdtDevicePath
 
 [Pcd]
   gEmbeddedTokenSpaceGuid.PcdFdtDevicePaths