ArmVirtPkg: drop dependency on PeiPcdLib for PEI Pcd.inf

[mirror_edk2.git] / ArmVirtPkg / ArmVirtQemuKernel.dsc

diff --git a/ArmVirtPkg/ArmVirtQemuKernel.dsc b/ArmVirtPkg/ArmVirtQemuKernel.dsc
index bfa4dbe9fd8ce39e0b0f5913b1710a5da7f8de8a..499173e08f70b33684a9e16a176f95622f64af69 100644 (file)
--- a/ArmVirtPkg/ArmVirtQemuKernel.dsc
+++ b/ArmVirtPkg/ArmVirtQemuKernel.dsc
@@ -255,7 +255,10 @@
     <LibraryClasses>\r
       NULL|MdeModulePkg/Library/DxeCrc32GuidedSectionExtractLib/DxeCrc32GuidedSectionExtractLib.inf\r
   }\r
-  MdeModulePkg/Universal/PCD/Dxe/Pcd.inf\r
+  MdeModulePkg/Universal/PCD/Dxe/Pcd.inf {\r
+    <LibraryClasses>\r
+      PcdLib|MdePkg/Library/BasePcdLibNull/BasePcdLibNull.inf\r
+  }\r
 \r
   #\r
   # Architectural Protocols\r
@@ -349,6 +352,7 @@
   ArmVirtPkg/PciHostBridgeDxe/PciHostBridgeDxe.inf\r
   MdeModulePkg/Bus/Pci/PciBusDxe/PciBusDxe.inf\r
   OvmfPkg/VirtioPciDeviceDxe/VirtioPciDeviceDxe.inf\r
+  OvmfPkg/Virtio10Dxe/Virtio10.inf\r
 \r
   #\r
   # Video support\r
@@ -367,15 +371,3 @@
   MdeModulePkg/Bus/Pci/XhciDxe/XhciDxe.inf\r
   MdeModulePkg/Bus/Usb/UsbBusDxe/UsbBusDxe.inf\r
   MdeModulePkg/Bus/Usb/UsbKbDxe/UsbKbDxe.inf\r
-\r
-[Components.ARM]\r
-  #\r
-  # The ARM/Linux kernel has no built in EFI boot stub (yet), so we still need\r
-  # an intermediate OS loader. Add the LinuxLoader UEFI application so we can\r
-  # invoke it from the shell.\r
-  #\r
-  MdeModulePkg/Universal/FvSimpleFileSystemDxe/FvSimpleFileSystemDxe.inf\r
-  ArmPkg/Application/LinuxLoader/LinuxLoader.inf {\r
-    <LibraryClasses>\r
-      BdsLib|ArmPkg/Library/BdsLib/BdsLib.inf\r
-  }\r