OvmfPkg: consolidate POWER_MGMT_REGISTER_Q35() on "Q35MchIch9.h" macros

[mirror_edk2.git] / OvmfPkg / OvmfPkgIa32X64.fdf

diff --git a/OvmfPkg/OvmfPkgIa32X64.fdf b/OvmfPkg/OvmfPkgIa32X64.fdf
index 218a78eb9efbeef41e10d013053b3f0c399dde87..7256ff33810cf1af54b46be2925af9517be8a9a4 100644 (file)
--- a/OvmfPkg/OvmfPkgIa32X64.fdf
+++ b/OvmfPkg/OvmfPkgIa32X64.fdf
@@ -227,10 +227,13 @@ INF  OvmfPkg/VirtioScsiDxe/VirtioScsi.inf
 INF  OvmfPkg/QemuFlashFvbServicesRuntimeDxe/FvbServicesRuntimeDxe.inf\r
 INF  OvmfPkg/EmuVariableFvbRuntimeDxe/Fvb.inf\r
 INF  MdeModulePkg/Universal/FaultTolerantWriteDxe/FaultTolerantWriteDxe.inf\r
+INF  OvmfPkg/XenIoPciDxe/XenIoPciDxe.inf\r
+INF  OvmfPkg/XenBusDxe/XenBusDxe.inf\r
+INF  OvmfPkg/XenPvBlkDxe/XenPvBlkDxe.inf\r
 \r
 !if $(SECURE_BOOT_ENABLE) == TRUE\r
   INF  SecurityPkg/VariableAuthenticated/RuntimeDxe/VariableRuntimeDxe.inf\r
-  INF  OvmfPkg/SecureBootConfigDxe/SecureBootConfigDxe.inf\r
+  INF  SecurityPkg/VariableAuthenticated/SecureBootConfigDxe/SecureBootConfigDxe.inf\r
 !else\r
   INF  MdeModulePkg/Universal/Variable/RuntimeDxe/VariableRuntimeDxe.inf\r
 !endif\r
@@ -306,10 +309,24 @@ FILE FREEFORM = PCD(gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdLogoFile) {
   INF  MdeModulePkg/Universal/Network/Ip4ConfigDxe/Ip4ConfigDxe.inf\r
   INF  MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Dxe.inf\r
   INF  MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Dxe.inf\r
-  INF  MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4Dxe.inf\r
   INF  MdeModulePkg/Universal/Network/Udp4Dxe/Udp4Dxe.inf\r
+!if $(NETWORK_IP6_ENABLE) == TRUE\r
+  INF  NetworkPkg/Ip6Dxe/Ip6Dxe.inf\r
+  INF  NetworkPkg/TcpDxe/TcpDxe.inf\r
+  INF  NetworkPkg/Udp6Dxe/Udp6Dxe.inf\r
+  INF  NetworkPkg/Dhcp6Dxe/Dhcp6Dxe.inf\r
+  INF  NetworkPkg/Mtftp6Dxe/Mtftp6Dxe.inf\r
+  INF  NetworkPkg/UefiPxeBcDxe/UefiPxeBcDxe.inf\r
+!if $(SECURE_BOOT_ENABLE) == TRUE\r
+  INF  NetworkPkg/IScsiDxe/IScsiDxe.inf\r
+!else\r
+  INF  MdeModulePkg/Universal/Network/IScsiDxe/IScsiDxe.inf\r
+!endif\r
+!else\r
+  INF  MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4Dxe.inf\r
   INF  MdeModulePkg/Universal/Network/UefiPxeBcDxe/UefiPxeBcDxe.inf\r
   INF  MdeModulePkg/Universal/Network/IScsiDxe/IScsiDxe.inf\r
+!endif\r
   INF  OvmfPkg/VirtioNetDxe/VirtioNet.inf\r
 \r
 #\r
@@ -317,6 +334,7 @@ FILE FREEFORM = PCD(gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdLogoFile) {
 #\r
 INF  MdeModulePkg/Bus/Pci/UhciDxe/UhciDxe.inf\r
 INF  MdeModulePkg/Bus/Pci/EhciDxe/EhciDxe.inf\r
+INF  MdeModulePkg/Bus/Pci/XhciDxe/XhciDxe.inf\r
 INF  MdeModulePkg/Bus/Usb/UsbBusDxe/UsbBusDxe.inf\r
 INF  MdeModulePkg/Bus/Usb/UsbKbDxe/UsbKbDxe.inf\r
 INF  MdeModulePkg/Bus/Usb/UsbMassStorageDxe/UsbMassStorageDxe.inf\r