ArmPlatformPkg/ArmJunoPkg/Drivers/ArmJunoDxe: Fixed crash on Juno R0

[mirror_edk2.git] / ArmPlatformPkg / ArmJunoPkg / Drivers / ArmJunoDxe / ArmJunoDxe.c

diff --git a/ArmPlatformPkg/ArmJunoPkg/Drivers/ArmJunoDxe/ArmJunoDxe.c b/ArmPlatformPkg/ArmJunoPkg/Drivers/ArmJunoDxe/ArmJunoDxe.c
index 47ff5871e30f869aaad69b3c7c1b47adec84a8da..f13c49559bb4364db9d5573fcbe6bbe946e4f194 100644 (file)
--- a/ArmPlatformPkg/ArmJunoPkg/Drivers/ArmJunoDxe/ArmJunoDxe.c
+++ b/ArmPlatformPkg/ArmJunoPkg/Drivers/ArmJunoDxe/ArmJunoDxe.c
@@ -378,6 +378,7 @@ OnEndOfDxe (
   EFI_DEVICE_PATH_PROTOCOL* PciRootComplexDevicePath;\r
   EFI_HANDLE                Handle;\r
   EFI_STATUS                Status;\r
+  UINT32                    JunoRevision;\r
 \r
   //\r
   // PCI Root Complex initialization\r
@@ -393,8 +394,14 @@ OnEndOfDxe (
   Status = gBS->ConnectController (Handle, NULL, PciRootComplexDevicePath, FALSE);\r
   ASSERT_EFI_ERROR (Status);\r
 \r
-  Status = ArmJunoSetNicMacAddress ();\r
-  ASSERT_EFI_ERROR (Status);\r
+  GetJunoRevision (JunoRevision);\r
+\r
+  if (JunoRevision != JUNO_REVISION_R0) {\r
+    Status = ArmJunoSetNicMacAddress ();\r
+    if (EFI_ERROR (Status)) {\r
+      DEBUG ((DEBUG_ERROR, "ArmJunoDxe: Failed to set Marvell Yukon NIC MAC address\n"));\r
+    }\r
+  }\r
 }\r
 \r
 STATIC\r