BaseTools/GenFfs: add FFS file types for MM modules.

[mirror_edk2.git] / OvmfPkg / OvmfPkgX64.fdf

diff --git a/OvmfPkg/OvmfPkgX64.fdf b/OvmfPkg/OvmfPkgX64.fdf
index 3bb11cbf7377f088e57ece98321af2087f86e7ec..4da0b19b94cfb40cfa4830187c748f72feff5a14 100644 (file)
--- a/OvmfPkg/OvmfPkgX64.fdf
+++ b/OvmfPkg/OvmfPkgX64.fdf
@@ -168,6 +168,7 @@ INF  UefiCpuPkg/CpuMpPei/CpuMpPei.inf
 ################################################################################\r
 \r
 [FV.DXEFV]\r
+FvForceRebase      = FALSE\r
 FvNameGuid         = 7CB8BDC9-F8EB-4F34-AAEA-3EE4AF6516A1\r
 BlockSize          = 0x10000\r
 FvAlignment        = 16\r
@@ -278,6 +279,7 @@ INF  OvmfPkg/AcpiPlatformDxe/AcpiPlatformDxe.inf
 INF  RuleOverride=ACPITABLE OvmfPkg/AcpiTables/AcpiTables.inf\r
 INF  MdeModulePkg/Universal/Acpi/S3SaveStateDxe/S3SaveStateDxe.inf\r
 INF  MdeModulePkg/Universal/Acpi/BootScriptExecutorDxe/BootScriptExecutorDxe.inf\r
+INF  MdeModulePkg/Universal/Acpi/BootGraphicsResourceTableDxe/BootGraphicsResourceTableDxe.inf\r
 \r
 INF  FatPkg/EnhancedFatDxe/Fat.inf\r
 \r
@@ -294,7 +296,7 @@ INF MdeModulePkg/Logo/LogoDxe.inf
 #\r
 !if $(E1000_ENABLE)\r
   FILE DRIVER = 5D695E11-9B3F-4b83-B25F-4A8D5D69BE07 {\r
-    SECTION PE32 = Intel3.5/EFIX64/E3507X2.EFI\r
+    SECTION PE32 = Intel3.5/EFIX64/E3522X2.EFI\r
   }\r
 !endif\r
   INF  MdeModulePkg/Universal/Network/SnpDxe/SnpDxe.inf\r
@@ -313,11 +315,7 @@ INF MdeModulePkg/Logo/LogoDxe.inf
   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
@@ -328,6 +326,10 @@ INF MdeModulePkg/Logo/LogoDxe.inf
   INF  NetworkPkg/HttpUtilitiesDxe/HttpUtilitiesDxe.inf\r
   INF  NetworkPkg/HttpDxe/HttpDxe.inf\r
   INF  NetworkPkg/HttpBootDxe/HttpBootDxe.inf\r
+!endif\r
+!if $(TLS_ENABLE) == TRUE\r
+  INF  NetworkPkg/TlsDxe/TlsDxe.inf\r
+  INF  NetworkPkg/TlsAuthConfigDxe/TlsAuthConfigDxe.inf\r
 !endif\r
   INF  OvmfPkg/VirtioNetDxe/VirtioNet.inf\r
 \r