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 --- ArmPlatformPkg/ArmJunoPkg/ArmJuno.dec | 4 +--- .../ArmJunoPkg/Drivers/ArmJunoDxe/ArmJunoDxe.inf | 4 +--- ArmPlatformPkg/ArmJunoPkg/Drivers/ArmJunoDxe/ArmJunoDxe.c | 14 +------------- 3 files changed, 3 insertions(+), 19 deletions(-)
diff --git a/ArmPlatformPkg/ArmJunoPkg/ArmJuno.dec b/ArmPlatformPkg/ArmJunoPkg/ArmJuno.dec index 040a906..7af8885 100644 --- a/ArmPlatformPkg/ArmJunoPkg/ArmJuno.dec +++ b/ArmPlatformPkg/ArmJunoPkg/ArmJuno.dec @@ -44,6 +44,4 @@ [PcdsFixedAtBuild.common] gArmJunoTokenSpaceGuid.PcdSynopsysUsbEhciBaseAddress|0x7FFC0000|UINT32|0x00000005
# Juno Device Trees are loaded from NOR Flash - gArmJunoTokenSpaceGuid.PcdJunoR0FdtDevicePath|L"VenHw(E7223039-5836-41E1-B542-D7EC736C5E59)/juno.dtb"|VOID*|0x00000006 - gArmJunoTokenSpaceGuid.PcdJunoR1A57x2FdtDevicePath|L"VenHw(E7223039-5836-41E1-B542-D7EC736C5E59)/r1a57.dtb"|VOID*|0x00000007 - gArmJunoTokenSpaceGuid.PcdJunoR1A57x2A53x4FdtDevicePath|L"VenHw(E7223039-5836-41E1-B542-D7EC736C5E59)/r1a57a53.dtb"|VOID*|0x00000008 + gArmJunoTokenSpaceGuid.PcdJunoFdtDevicePath|L"VenHw(E7223039-5836-41E1-B542-D7EC736C5E59)/board.dtb"|VOID*|0x00000008 diff --git a/ArmPlatformPkg/ArmJunoPkg/Drivers/ArmJunoDxe/ArmJunoDxe.inf b/ArmPlatformPkg/ArmJunoPkg/Drivers/ArmJunoDxe/ArmJunoDxe.inf index d1f2f7b..6ab81e8 100644 --- a/ArmPlatformPkg/ArmJunoPkg/Drivers/ArmJunoDxe/ArmJunoDxe.inf +++ b/ArmPlatformPkg/ArmJunoPkg/Drivers/ArmJunoDxe/ArmJunoDxe.inf @@ -73,9 +73,7 @@ [FixedPcd] gArmJunoTokenSpaceGuid.PcdSynopsysUsbEhciBaseAddress gArmJunoTokenSpaceGuid.PcdSynopsysUsbOhciBaseAddress
- gArmJunoTokenSpaceGuid.PcdJunoR0FdtDevicePath - gArmJunoTokenSpaceGuid.PcdJunoR1A57x2FdtDevicePath - gArmJunoTokenSpaceGuid.PcdJunoR1A57x2A53x4FdtDevicePath + gArmJunoTokenSpaceGuid.PcdJunoFdtDevicePath
gArmPlatformTokenSpaceGuid.PcdDefaultBootDevicePath gArmPlatformTokenSpaceGuid.PcdDefaultBootArgument diff --git a/ArmPlatformPkg/ArmJunoPkg/Drivers/ArmJunoDxe/ArmJunoDxe.c b/ArmPlatformPkg/ArmJunoPkg/Drivers/ArmJunoDxe/ArmJunoDxe.c index 205aead..dba1fcd 100644 --- a/ArmPlatformPkg/ArmJunoPkg/Drivers/ArmJunoDxe/ArmJunoDxe.c +++ b/ArmPlatformPkg/ArmJunoPkg/Drivers/ArmJunoDxe/ArmJunoDxe.c @@ -274,19 +274,7 @@ ArmJunoEntryPoint ( // // Set up the device path to the FDT. // - switch (JunoRevision) { - case JUNO_R0: - TextDevicePath = (CHAR16*)FixedPcdGetPtr (PcdJunoR0FdtDevicePath); - break; - - case JUNO_R1: - TextDevicePath = (CHAR16*)FixedPcdGetPtr (PcdJunoR1A57x2FdtDevicePath); - break; - - default: - TextDevicePath = NULL; - } - + TextDevicePath = (CHAR16*)FixedPcdGetPtr (PcdJunoFdtDevicePath); if (TextDevicePath != NULL) { TextDevicePathSize = StrSize (TextDevicePath); Buffer = PcdSetPtr (PcdFdtDevicePaths, &TextDevicePathSize, TextDevicePath);