OvmfPkg: enable the IPv6 support

[mirror_edk2.git] / OvmfPkg / OvmfPkgX64.fdf

diff --git a/OvmfPkg/OvmfPkgX64.fdf b/OvmfPkg/OvmfPkgX64.fdf
index 1b029b8be398465419af5be6bc3b0494ec10036a..2323eb2edf33c56ff3a077fcdeed1eafa8de560d 100644 (file)
--- a/OvmfPkg/OvmfPkgX64.fdf
+++ b/OvmfPkg/OvmfPkgX64.fdf
@@ -1,7 +1,7 @@
 ## @file\r
 #  Open Virtual Machine Firmware: FDF\r
 #\r
-#  Copyright (c) 2006 - 2013, Intel Corporation. All rights reserved.<BR>\r
+#  Copyright (c) 2006 - 2014, Intel Corporation. All rights reserved.<BR>\r
 #\r
 #  This program and the accompanying materials\r
 #  are licensed and made available under the terms and conditions of the BSD License\r
@@ -136,7 +136,7 @@ READ_LOCK_STATUS   = TRUE
 #\r
 INF  OvmfPkg/Sec/SecMain.inf\r
 \r
-INF  RuleOverride=RESET_VECTOR OvmfPkg/ResetVector/Bin/ResetVector.inf\r
+INF  RuleOverride=RESET_VECTOR OvmfPkg/ResetVector/ResetVector.inf\r
 \r
 ################################################################################\r
 [FV.PEIFV]\r
@@ -227,10 +227,12 @@ 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/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 +308,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
@@ -452,5 +468,5 @@ FILE FV_IMAGE = 9E21FD93-9C72-4c15-8C4B-E77F1DB2D792 {
 \r
 [Rule.Common.SEC.RESET_VECTOR]\r
   FILE RAW = $(NAMED_GUID) {\r
-    RAW RAW                |.raw\r
+    RAW BIN   Align = 16   |.bin\r
   }\r