CryptoPkg: Extend Tls function library

[mirror_edk2.git] / UefiPayloadPkg / UefiPayloadPkg.fdf

diff --git a/UefiPayloadPkg/UefiPayloadPkg.fdf b/UefiPayloadPkg/UefiPayloadPkg.fdf
index f619a23139edd806f447f64b80d09e4f2f0d5f3e..9c9e2f27414d7a4c42f2d5206388e1f08608cc8d 100644 (file)
--- a/UefiPayloadPkg/UefiPayloadPkg.fdf
+++ b/UefiPayloadPkg/UefiPayloadPkg.fdf
@@ -99,12 +99,15 @@ INF MdeModulePkg/Universal/PCD/Dxe/Pcd.inf
 INF MdeModulePkg/Universal/ReportStatusCodeRouter/RuntimeDxe/ReportStatusCodeRouterRuntimeDxe.inf\r
 INF MdeModulePkg/Universal/StatusCodeHandler/RuntimeDxe/StatusCodeHandlerRuntimeDxe.inf\r
 \r
+!if $(CRYPTO_PROTOCOL_SUPPORT) == TRUE\r
+INF CryptoPkg/Driver/CryptoDxe.inf\r
+!endif\r
 !if $(SECURITY_STUB_ENABLE) == TRUE\r
 INF MdeModulePkg/Universal/SecurityStubDxe/SecurityStubDxe.inf\r
 !endif\r
 INF UefiCpuPkg/CpuDxe/CpuDxe.inf\r
 INF MdeModulePkg/Universal/BdsDxe/BdsDxe.inf\r
-INF MdeModulePkg/Application/UiApp/UiApp.inf\r
+INF RuleOverride = UI MdeModulePkg/Application/UiApp/UiApp.inf\r
 INF MdeModulePkg/Application/BootManagerMenuApp/BootManagerMenuApp.inf\r
 INF PcAtChipsetPkg/HpetTimerDxe/HpetTimerDxe.inf\r
 INF MdeModulePkg/Universal/Metronome/Metronome.inf\r
@@ -149,7 +152,11 @@ INF PcAtChipsetPkg/PcatRealTimeClockRuntimeDxe/PcatRealTimeClockRuntimeDxe.inf
 \r
 INF UefiCpuPkg/CpuIo2Dxe/CpuIo2Dxe.inf\r
 INF MdeModulePkg/Universal/DevicePathDxe/DevicePathDxe.inf\r
-INF MdeModulePkg/Universal/MemoryTest/NullMemoryTestDxe/NullMemoryTestDxe.inf\r
+!if $(MEMORY_TEST) == "GENERIC"\r
+INF  MdeModulePkg/Universal/MemoryTest/GenericMemoryTestDxe/GenericMemoryTestDxe.inf\r
+!elseif $(MEMORY_TEST) == "NULL"\r
+INF  MdeModulePkg/Universal/MemoryTest/NullMemoryTestDxe/NullMemoryTestDxe.inf\r
+!endif\r
 INF MdeModulePkg/Universal/HiiDatabaseDxe/HiiDatabaseDxe.inf\r
 INF MdeModulePkg/Universal/SetupBrowserDxe/SetupBrowserDxe.inf\r
 INF MdeModulePkg/Universal/DisplayEngineDxe/DisplayEngineDxe.inf\r
@@ -158,6 +165,10 @@ INF MdeModulePkg/Universal/EbcDxe/EbcDxe.inf
 INF UefiPayloadPkg/BlSupportDxe/BlSupportDxe.inf\r
 \r
 INF MdeModulePkg/Universal/SmbiosDxe/SmbiosDxe.inf\r
+!if $(BOOTSPLASH_IMAGE)\r
+INF MdeModulePkg/Logo/LogoDxe.inf\r
+!endif\r
+\r
 #\r
 # PCI Support\r
 #\r
@@ -176,7 +187,9 @@ INF OvmfPkg/SioBusDxe/SioBusDxe.inf
 !if $(PS2_KEYBOARD_ENABLE) == TRUE\r
 INF MdeModulePkg/Bus/Isa/Ps2KeyboardDxe/Ps2KeyboardDxe.inf\r
 !endif\r
+!if $(PS2_MOUSE_ENABLE) == TRUE\r
 INF MdeModulePkg/Bus/Isa/Ps2MouseDxe/Ps2MouseDxe.inf\r
+!endif\r
 \r
 #\r
 # Console Support\r
@@ -195,12 +208,16 @@ INF UefiPayloadPkg/GraphicsOutputDxe/GraphicsOutputDxe.inf
 INF MdeModulePkg/Universal/Disk/DiskIoDxe/DiskIoDxe.inf\r
 INF MdeModulePkg/Universal/Disk/PartitionDxe/PartitionDxe.inf\r
 INF MdeModulePkg/Universal/Disk/UnicodeCollation/EnglishDxe/EnglishDxe.inf\r
+!if $(ATA_ENABLE) == TRUE\r
 INF MdeModulePkg/Bus/Pci/SataControllerDxe/SataControllerDxe.inf\r
 INF MdeModulePkg/Bus/Ata/AtaBusDxe/AtaBusDxe.inf\r
+!endif\r
 INF MdeModulePkg/Bus/Ata/AtaAtapiPassThru/AtaAtapiPassThru.inf\r
 INF MdeModulePkg/Bus/Scsi/ScsiBusDxe/ScsiBusDxe.inf\r
 INF MdeModulePkg/Bus/Scsi/ScsiDiskDxe/ScsiDiskDxe.inf\r
+!if $(NVME_ENABLE) == TRUE\r
 INF MdeModulePkg/Bus/Pci/NvmExpressDxe/NvmExpressDxe.inf\r
+!endif\r
 !if $(RAM_DISK_ENABLE) == TRUE\r
 INF MdeModulePkg/Universal/Disk/RamDiskDxe/RamDiskDxe.inf\r
 !endif\r
@@ -209,9 +226,11 @@ INF FatPkg/EnhancedFatDxe/Fat.inf
 #\r
 # SD/eMMC Support\r
 #\r
+!if $(SD_ENABLE) == TRUE\r
 INF MdeModulePkg/Bus/Pci/SdMmcPciHcDxe/SdMmcPciHcDxe.inf\r
 INF MdeModulePkg/Bus/Sd/EmmcDxe/EmmcDxe.inf\r
 INF MdeModulePkg/Bus/Sd/SdDxe/SdDxe.inf\r
+!endif\r
 \r
 #\r
 # Usb Support\r
@@ -228,6 +247,10 @@ INF MdeModulePkg/Bus/Usb/UsbMouseDxe/UsbMouseDxe.inf
 # ACPI Support\r
 #\r
 INF  MdeModulePkg/Universal/Acpi/AcpiTableDxe/AcpiTableDxe.inf\r
+!if $(BOOTSPLASH_IMAGE)\r
+INF  MdeModulePkg/Universal/Acpi/AcpiPlatformDxe/AcpiPlatformDxe.inf\r
+INF  MdeModulePkg/Universal/Acpi/BootGraphicsResourceTableDxe/BootGraphicsResourceTableDxe.inf\r
+!endif\r
 \r
 #\r
 # UEFI network modules\r
@@ -241,7 +264,9 @@ INF  MdeModulePkg/Universal/Acpi/AcpiTableDxe/AcpiTableDxe.inf
 #\r
 !if $(SHELL_TYPE) == BUILD_SHELL\r
 INF ShellPkg/DynamicCommand/TftpDynamicCommand/TftpDynamicCommand.inf\r
+!if $(PERFORMANCE_MEASUREMENT_ENABLE) == TRUE\r
 INF ShellPkg/DynamicCommand/DpDynamicCommand/DpDynamicCommand.inf\r
+!endif\r
 INF ShellPkg/Application/Shell/Shell.inf\r
 !endif\r
 \r
@@ -357,3 +382,10 @@ INF ShellPkg/Application/Shell/Shell.inf
   FILE RAW = $(NAMED_GUID) {\r
     RAW RAW                |.raw\r
   }\r
+\r
+[Rule.Common.UEFI_APPLICATION.UI]\r
+  FILE APPLICATION = $(NAMED_GUID) {\r
+    PE32      PE32                     $(INF_OUTPUT)/$(MODULE_NAME).efi\r
+    UI        STRING="Enter Setup"\r
+    VERSION   STRING="$(INF_VERSION)" Optional BUILD_NUM=$(BUILD_NUMBER)\r
+  }\r