IntelFsp2WrapperPkg: Revert 90c5bc08

[mirror_edk2.git] / ArmVirtPkg / ArmVirtQemuFvMain.fdf.inc

diff --git a/ArmVirtPkg/ArmVirtQemuFvMain.fdf.inc b/ArmVirtPkg/ArmVirtQemuFvMain.fdf.inc
index 744006d13cbba191c3bff5f889a13838170c23cc..a6390bd4b8419d64458023f3810b5b12ebbe6c5e 100644 (file)
--- a/ArmVirtPkg/ArmVirtQemuFvMain.fdf.inc
+++ b/ArmVirtPkg/ArmVirtQemuFvMain.fdf.inc
@@ -1,7 +1,7 @@
 #\r
 #  Copyright (c) 2011-2015, ARM Limited. All rights reserved.\r
 #  Copyright (c) 2014-2016, Linaro Limited. All rights reserved.\r
-#  Copyright (c) 2015 - 2016, Intel Corporation. All rights reserved.\r
+#  Copyright (c) 2015 - 2017, Intel Corporation. All rights reserved.\r
 #\r
 #  This program and the accompanying materials\r
 #  are licensed and made available under the terms and conditions of the BSD License\r
@@ -103,6 +103,7 @@ READ_LOCK_STATUS   = TRUE
   # UEFI application (Shell Embedded Boot Loader)\r
   #\r
   INF ShellPkg/Application/Shell/Shell.inf\r
+  INF ShellPkg/DynamicCommand/TftpDynamicCommand/TftpDynamicCommand.inf\r
 \r
   #\r
   # Bds\r
@@ -124,10 +125,20 @@ READ_LOCK_STATUS   = TRUE
   INF MdeModulePkg/Universal/Network/MnpDxe/MnpDxe.inf\r
   INF MdeModulePkg/Universal/Network/VlanConfigDxe/VlanConfigDxe.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
+  INF NetworkPkg/IScsiDxe/IScsiDxe.inf\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
 !if $(HTTP_BOOT_ENABLE) == TRUE\r
   INF NetworkPkg/DnsDxe/DnsDxe.inf\r
   INF NetworkPkg/HttpUtilitiesDxe/HttpUtilitiesDxe.inf\r
@@ -174,6 +185,7 @@ READ_LOCK_STATUS   = TRUE
   #\r
   # Video support\r
   #\r
+  INF OvmfPkg/QemuRamfbDxe/QemuRamfbDxe.inf\r
   INF OvmfPkg/VirtioGpuDxe/VirtioGpu.inf\r
   INF OvmfPkg/PlatformDxe/Platform.inf\r
 \r