ArmVirtPkg: unify HttpLib resolutions in "ArmVirt.dsc.inc"

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

diff --git a/ArmVirtPkg/ArmVirtQemuFvMain.fdf.inc b/ArmVirtPkg/ArmVirtQemuFvMain.fdf.inc
index 7bed6785d09901ddeb093ab8d1bbaaac82ab5cf9..63a202c788864e8098b9404e39b4862c79cbff4c 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
@@ -24,6 +24,7 @@
 ################################################################################\r
 \r
 [FV.FvMain]\r
+FvNameGuid         = 64074afe-340a-4be6-94ba-91b5b4d0f71e\r
 BlockSize          = 0x40\r
 NumBlocks          = 0         # This FV gets compressed so make it just big enough\r
 FvAlignment        = 16        # FV alignment and FV attributes setting.\r
@@ -62,7 +63,7 @@ READ_LOCK_STATUS   = TRUE
   INF SecurityPkg/VariableAuthenticated/SecureBootConfigDxe/SecureBootConfigDxe.inf\r
 !endif\r
   INF MdeModulePkg/Universal/MonotonicCounterRuntimeDxe/MonotonicCounterRuntimeDxe.inf\r
-  INF EmbeddedPkg/ResetRuntimeDxe/ResetRuntimeDxe.inf\r
+  INF MdeModulePkg/Universal/ResetSystemRuntimeDxe/ResetSystemRuntimeDxe.inf\r
   INF EmbeddedPkg/RealTimeClockRuntimeDxe/RealTimeClockRuntimeDxe.inf\r
   INF EmbeddedPkg/MetronomeDxe/MetronomeDxe.inf\r
   INF MdeModulePkg/Universal/HiiDatabaseDxe/HiiDatabaseDxe.inf\r
@@ -82,12 +83,13 @@ READ_LOCK_STATUS   = TRUE
   INF MdeModulePkg/Universal/WatchdogTimerDxe/WatchdogTimer.inf\r
 \r
   #\r
-  # FAT filesystem + GPT/MBR partitioning\r
+  # FAT filesystem + GPT/MBR partitioning + UDF filesystem\r
   #\r
   INF MdeModulePkg/Universal/Disk/DiskIoDxe/DiskIoDxe.inf\r
   INF MdeModulePkg/Universal/Disk/PartitionDxe/PartitionDxe.inf\r
   INF FatPkg/EnhancedFatDxe/Fat.inf\r
   INF MdeModulePkg/Universal/Disk/UnicodeCollation/EnglishDxe/EnglishDxe.inf\r
+  INF MdeModulePkg/Universal/Disk/UdfDxe/UdfDxe.inf\r
 \r
   #\r
   # Platform Driver\r
@@ -101,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
@@ -126,6 +129,12 @@ READ_LOCK_STATUS   = TRUE
   INF MdeModulePkg/Universal/Network/Udp4Dxe/Udp4Dxe.inf\r
   INF MdeModulePkg/Universal/Network/UefiPxeBcDxe/UefiPxeBcDxe.inf\r
   INF MdeModulePkg/Universal/Network/IScsiDxe/IScsiDxe.inf\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
 \r
   #\r
   # SCSI Bus and Disk Driver\r
@@ -139,18 +148,26 @@ READ_LOCK_STATUS   = TRUE
   INF MdeModulePkg/Universal/SmbiosDxe/SmbiosDxe.inf\r
   INF OvmfPkg/SmbiosPlatformDxe/SmbiosPlatformDxe.inf\r
 \r
-!if $(ARCH) == AARCH64\r
   #\r
   # ACPI Support\r
   #\r
+  INF ArmVirtPkg/PlatformHasAcpiDtDxe/PlatformHasAcpiDtDxe.inf\r
+!if $(ARCH) == AARCH64\r
   INF MdeModulePkg/Universal/Acpi/AcpiTableDxe/AcpiTableDxe.inf\r
+  INF MdeModulePkg/Universal/Acpi/BootGraphicsResourceTableDxe/BootGraphicsResourceTableDxe.inf\r
   INF OvmfPkg/AcpiPlatformDxe/QemuFwCfgAcpiPlatformDxe.inf\r
+\r
+  #\r
+  # EBC support\r
+  #\r
+  INF MdeModulePkg/Universal/EbcDxe/EbcDxe.inf\r
 !endif\r
 \r
   #\r
   # PCI support\r
   #\r
-  INF ArmVirtPkg/PciHostBridgeDxe/PciHostBridgeDxe.inf\r
+  INF ArmPkg/Drivers/ArmPciCpuIo2Dxe/ArmPciCpuIo2Dxe.inf\r
+  INF MdeModulePkg/Bus/Pci/PciHostBridgeDxe/PciHostBridgeDxe.inf\r
   INF MdeModulePkg/Bus/Pci/PciBusDxe/PciBusDxe.inf\r
   INF OvmfPkg/VirtioPciDeviceDxe/VirtioPciDeviceDxe.inf\r
   INF OvmfPkg/Virtio10Dxe/Virtio10.inf\r
@@ -158,7 +175,8 @@ READ_LOCK_STATUS   = TRUE
   #\r
   # Video support\r
   #\r
-  INF OvmfPkg/QemuVideoDxe/QemuVideoDxe.inf\r
+  INF OvmfPkg/QemuRamfbDxe/QemuRamfbDxe.inf\r
+  INF OvmfPkg/VirtioGpuDxe/VirtioGpu.inf\r
   INF OvmfPkg/PlatformDxe/Platform.inf\r
 \r
   #\r
@@ -169,10 +187,14 @@ READ_LOCK_STATUS   = TRUE
   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
 \r
   #\r
   # TianoCore logo (splash screen)\r
   #\r
-  FILE FREEFORM = PCD(gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdLogoFile) {\r
-    SECTION RAW = MdeModulePkg/Logo/Logo.bmp\r
-  }\r
+  INF MdeModulePkg/Logo/LogoDxe.inf\r
+\r
+  #\r
+  # Ramdisk support\r
+  #\r
+  INF MdeModulePkg/Universal/Disk/RamDiskDxe/RamDiskDxe.inf\r