SignedCapsulePkg: Replace [Ascii|Unicode]ValueToString

[mirror_edk2.git] / OvmfPkg / OvmfPkgX64.fdf

diff --git a/OvmfPkg/OvmfPkgX64.fdf b/OvmfPkg/OvmfPkgX64.fdf
index 28b98a9f5cd3b163fe429a724700615e55fa0b90..36150101e78473e6caa54de734f42f0f0c13fcaf 100644 (file)
--- a/OvmfPkg/OvmfPkgX64.fdf
+++ b/OvmfPkg/OvmfPkgX64.fdf
@@ -215,7 +215,7 @@ INF  OvmfPkg/IncompatiblePciDeviceSupportDxe/IncompatiblePciDeviceSupport.inf
 INF  OvmfPkg/PciHotPlugInitDxe/PciHotPlugInit.inf\r
 INF  MdeModulePkg/Bus/Pci/PciHostBridgeDxe/PciHostBridgeDxe.inf\r
 INF  MdeModulePkg/Bus/Pci/PciBusDxe/PciBusDxe.inf\r
-INF  PcAtChipsetPkg/KbcResetDxe/Reset.inf\r
+INF  MdeModulePkg/Universal/ResetSystemRuntimeDxe/ResetSystemRuntimeDxe.inf\r
 INF  MdeModulePkg/Universal/Metronome/Metronome.inf\r
 INF  PcAtChipsetPkg/PcatRealTimeClockRuntimeDxe/PcatRealTimeClockRuntimeDxe.inf\r
 \r
@@ -278,6 +278,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
@@ -287,9 +288,7 @@ INF  ShellPkg/Application/Shell/Shell.inf
 INF  RuleOverride = BINARY EdkShellBinPkg/FullShell/FullShell.inf\r
 !endif\r
 \r
-FILE FREEFORM = PCD(gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdLogoFile) {\r
-  SECTION RAW = MdeModulePkg/Logo/Logo.bmp\r
-}\r
+INF MdeModulePkg/Logo/LogoDxe.inf\r
 \r
 #\r
 # Network modules\r
@@ -315,11 +314,7 @@ FILE FREEFORM = PCD(gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdLogoFile) {
   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
@@ -330,6 +325,10 @@ FILE FREEFORM = PCD(gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdLogoFile) {
   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
@@ -350,6 +349,7 @@ INF  RuleOverride=CSM OvmfPkg/Csm/Csm16/Csm16.inf
 !endif\r
 \r
 INF  OvmfPkg/QemuVideoDxe/QemuVideoDxe.inf\r
+INF  OvmfPkg/VirtioGpuDxe/VirtioGpu.inf\r
 INF  OvmfPkg/PlatformDxe/Platform.inf\r
 \r
 !if $(SMM_REQUIRE) == TRUE\r