OvmfPkg/Csm/LegacyBiosDxe: Update to make it build for OVMF

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

diff --git a/ArmVirtPkg/ArmVirtQemuFvMain.fdf.inc b/ArmVirtPkg/ArmVirtQemuFvMain.fdf.inc
index a6390bd4b8419d64458023f3810b5b12ebbe6c5e..31f615a9d0f9ae98a11ba4868143cd9c0adec6d4 100644 (file)
--- a/ArmVirtPkg/ArmVirtQemuFvMain.fdf.inc
+++ b/ArmVirtPkg/ArmVirtQemuFvMain.fdf.inc
@@ -3,13 +3,7 @@
 #  Copyright (c) 2014-2016, Linaro Limited. 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
-#  which accompanies this distribution.  The full text of the license may be found at\r
-#  http://opensource.org/licenses/bsd-license.php\r
-#\r
-#  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
-#  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
+#  SPDX-License-Identifier: BSD-2-Clause-Patent\r
 #\r
 \r
 ################################################################################\r
@@ -91,6 +85,11 @@ READ_LOCK_STATUS   = TRUE
   INF MdeModulePkg/Universal/Disk/UnicodeCollation/EnglishDxe/EnglishDxe.inf\r
   INF MdeModulePkg/Universal/Disk/UdfDxe/UdfDxe.inf\r
 \r
+  #\r
+  # Status Code Routing\r
+  #\r
+  INF MdeModulePkg/Universal/ReportStatusCodeRouter/RuntimeDxe/ReportStatusCodeRouterRuntimeDxe.inf\r
+\r
   #\r
   # Platform Driver\r
   #\r
@@ -118,33 +117,8 @@ READ_LOCK_STATUS   = TRUE
   #\r
   # Networking stack\r
   #\r
-  INF MdeModulePkg/Universal/Network/DpcDxe/DpcDxe.inf\r
-  INF MdeModulePkg/Universal/Network/ArpDxe/ArpDxe.inf\r
-  INF MdeModulePkg/Universal/Network/Dhcp4Dxe/Dhcp4Dxe.inf\r
-  INF MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Dxe.inf\r
-  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/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
-  INF NetworkPkg/HttpDxe/HttpDxe.inf\r
-  INF NetworkPkg/HttpBootDxe/HttpBootDxe.inf\r
-!endif\r
+!include NetworkPkg/Network.fdf.inc\r
+\r
 \r
   #\r
   # SCSI Bus and Disk Driver\r