ArmPlatformPkg/ArmJunoPkg: only have 1 PCD for the FDT

Juno doesn't have lots of DTB files in NOR flash, it only has 1 file,
called "board.dtb" and the motherboard configuration makes the right
choice about which DTB file gets written as board.dtb in NOR.

The code attempts to select which DTB it should use based on the board
variant or configuration.  And this doesn't work because those DTB files
aren't present in NOR flash.

So remove the DTB variants and only load board.dtb.

Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Ryan Harkin <ryan.harkin@linaro.org>
Reviewed-by: Leif Lindholm <leif.lindholm@linaro.org>

diff --git a/ArmPlatformPkg/ArmJunoPkg/ArmJuno.dec b/ArmPlatformPkg/ArmJunoPkg/ArmJuno.dec
index 040a906ac1d2efcdc7835e5a11e8271599abf28a..7af8885ddf2da3549dea8dad979a87f693ee4bf8 100644 (file)
--- a/ArmPlatformPkg/ArmJunoPkg/ArmJuno.dec
+++ b/ArmPlatformPkg/ArmJunoPkg/ArmJuno.dec
@@ -44,6 +44,4 @@
   gArmJunoTokenSpaceGuid.PcdSynopsysUsbEhciBaseAddress|0x7FFC0000|UINT32|0x00000005\r
 \r
   # Juno Device Trees are loaded from NOR Flash\r
-  gArmJunoTokenSpaceGuid.PcdJunoR0FdtDevicePath|L"VenHw(E7223039-5836-41E1-B542-D7EC736C5E59)/juno.dtb"|VOID*|0x00000006\r
-  gArmJunoTokenSpaceGuid.PcdJunoR1A57x2FdtDevicePath|L"VenHw(E7223039-5836-41E1-B542-D7EC736C5E59)/r1a57.dtb"|VOID*|0x00000007\r
-  gArmJunoTokenSpaceGuid.PcdJunoR1A57x2A53x4FdtDevicePath|L"VenHw(E7223039-5836-41E1-B542-D7EC736C5E59)/r1a57a53.dtb"|VOID*|0x00000008\r
+  gArmJunoTokenSpaceGuid.PcdJunoFdtDevicePath|L"VenHw(E7223039-5836-41E1-B542-D7EC736C5E59)/board.dtb"|VOID*|0x00000008\r

diff --git a/ArmPlatformPkg/ArmJunoPkg/Drivers/ArmJunoDxe/ArmJunoDxe.c b/ArmPlatformPkg/ArmJunoPkg/Drivers/ArmJunoDxe/ArmJunoDxe.c
index 205aead0e9c6a34e986d7fc7a9512eacbde823b0..dba1fcd7aeef020fa3c0ddf8419777ce844aaadb 100644 (file)
--- a/ArmPlatformPkg/ArmJunoPkg/Drivers/ArmJunoDxe/ArmJunoDxe.c
+++ b/ArmPlatformPkg/ArmJunoPkg/Drivers/ArmJunoDxe/ArmJunoDxe.c
@@ -274,19 +274,7 @@ ArmJunoEntryPoint (
   //\r
   // Set up the device path to the FDT.\r
   //\r
-  switch (JunoRevision) {\r
-  case JUNO_R0:\r
-    TextDevicePath = (CHAR16*)FixedPcdGetPtr (PcdJunoR0FdtDevicePath);\r
-    break;\r
-\r
-  case JUNO_R1:\r
-    TextDevicePath = (CHAR16*)FixedPcdGetPtr (PcdJunoR1A57x2FdtDevicePath);\r
-    break;\r
-\r
-  default:\r
-    TextDevicePath = NULL;\r
-  }\r
-\r
+  TextDevicePath = (CHAR16*)FixedPcdGetPtr (PcdJunoFdtDevicePath);\r
   if (TextDevicePath != NULL) {\r
     TextDevicePathSize = StrSize (TextDevicePath);\r
     Buffer = PcdSetPtr (PcdFdtDevicePaths, &TextDevicePathSize, TextDevicePath);\r

diff --git a/ArmPlatformPkg/ArmJunoPkg/Drivers/ArmJunoDxe/ArmJunoDxe.inf b/ArmPlatformPkg/ArmJunoPkg/Drivers/ArmJunoDxe/ArmJunoDxe.inf
index d1f2f7bada950700e6dae4eddf7dbef9c4a358f3..6ab81e8dd60a6fdf6cf0795306510ac992ec84c8 100644 (file)
--- a/ArmPlatformPkg/ArmJunoPkg/Drivers/ArmJunoDxe/ArmJunoDxe.inf
+++ b/ArmPlatformPkg/ArmJunoPkg/Drivers/ArmJunoDxe/ArmJunoDxe.inf
@@ -73,9 +73,7 @@
   gArmJunoTokenSpaceGuid.PcdSynopsysUsbEhciBaseAddress\r
   gArmJunoTokenSpaceGuid.PcdSynopsysUsbOhciBaseAddress\r
 \r
-  gArmJunoTokenSpaceGuid.PcdJunoR0FdtDevicePath\r
-  gArmJunoTokenSpaceGuid.PcdJunoR1A57x2FdtDevicePath\r
-  gArmJunoTokenSpaceGuid.PcdJunoR1A57x2A53x4FdtDevicePath\r
+  gArmJunoTokenSpaceGuid.PcdJunoFdtDevicePath\r
 \r
   gArmPlatformTokenSpaceGuid.PcdDefaultBootDevicePath\r
   gArmPlatformTokenSpaceGuid.PcdDefaultBootArgument\r