ArmVirtPkg/VirtFdtDxe: move FDT config table installation to FdtClientDxe

[mirror_edk2.git] / ArmVirtPkg / VirtFdtDxe / VirtFdtDxe.c

diff --git a/ArmVirtPkg/VirtFdtDxe/VirtFdtDxe.c b/ArmVirtPkg/VirtFdtDxe/VirtFdtDxe.c
index 4fca50a6b34798765115d1d39145ea760f06bfa4..cebd4aa91fd9e6f0af50b2af546159bfa2142e6f 100644 (file)
--- a/ArmVirtPkg/VirtFdtDxe/VirtFdtDxe.c
+++ b/ArmVirtPkg/VirtFdtDxe/VirtFdtDxe.c
@@ -28,7 +28,6 @@
 #include <libfdt.h>\r
 #include <Library/XenIoMmioLib.h>\r
 \r
-#include <Guid/Fdt.h>\r
 #include <Guid/VirtioMmioTransport.h>\r
 #include <Guid/FdtHob.h>\r
 \r
@@ -43,7 +42,6 @@ typedef struct {
 typedef enum {\r
   PropertyTypeUnknown,\r
   PropertyTypeVirtio,\r
-  PropertyTypeUart,\r
   PropertyTypeXen,\r
 } PROPERTY_TYPE;\r
 \r
@@ -54,7 +52,6 @@ typedef struct {
 \r
 STATIC CONST PROPERTY CompatibleProperties[] = {\r
   { PropertyTypeVirtio,  "virtio,mmio"           },\r
-  { PropertyTypeUart,    "arm,pl011"             },\r
   { PropertyTypeXen,     "xen,xen"               },\r
   { PropertyTypeUnknown, ""                      }\r
 };\r
@@ -217,14 +214,5 @@ InitializeVirtFdtDxe (
     }\r
   }\r
 \r
-  if (!FeaturePcdGet (PcdPureAcpiBoot)) {\r
-    //\r
-    // Only install the FDT as a configuration table if we want to leave it up\r
-    // to the OS to decide whether it prefers ACPI over DT.\r
-    //\r
-    Status = gBS->InstallConfigurationTable (&gFdtTableGuid, DeviceTreeBase);\r
-    ASSERT_EFI_ERROR (Status);\r
-  }\r
-\r
   return EFI_SUCCESS;\r
 }\r