UefiPayloadPkg: Add macro to control NvmExpressDxe

[mirror_edk2.git] / UefiPayloadPkg / UefiPayloadPkg.fdf

diff --git a/UefiPayloadPkg/UefiPayloadPkg.fdf b/UefiPayloadPkg/UefiPayloadPkg.fdf
index ed7fbcaddbd037c19e598b486d15577e4475e249..9c9e2f27414d7a4c42f2d5206388e1f08608cc8d 100644 (file)
--- a/UefiPayloadPkg/UefiPayloadPkg.fdf
+++ b/UefiPayloadPkg/UefiPayloadPkg.fdf
@@ -17,8 +17,8 @@ DEFINE FD_SIZE     = 0x00850000
 DEFINE NUM_BLOCKS  = 0x850\r
 !else\r
 \r
-DEFINE FD_SIZE     = 0x00410000\r
-DEFINE NUM_BLOCKS  = 0x410\r
+DEFINE FD_SIZE     = 0x00590000\r
+DEFINE NUM_BLOCKS  = 0x590\r
 !endif\r
 \r
 ################################################################################\r
@@ -34,6 +34,7 @@ FV = PLDFV
 \r
 ################################################################################\r
 [FV.PLDFV]\r
+FvNameGuid         = 96E75986-6FDD-491E-9FD5-35E21AC45B45\r
 BlockSize          = $(FD_BLOCK_SIZE)\r
 FvAlignment        = 16\r
 ERASE_POLARITY     = 1\r
@@ -52,8 +53,9 @@ READ_STATUS        = TRUE
 READ_LOCK_CAP      = TRUE\r
 READ_LOCK_STATUS   = TRUE\r
 \r
+!if $(UNIVERSAL_PAYLOAD) == FALSE\r
 INF UefiPayloadPkg/UefiPayloadEntry/UefiPayloadEntry.inf\r
-\r
+!endif\r
 FILE FV_IMAGE = 4E35FD93-9C72-4c15-8C4B-E77F1DB2D793 {\r
     SECTION FV_IMAGE = DXEFV\r
 }\r
@@ -61,6 +63,7 @@ FILE FV_IMAGE = 4E35FD93-9C72-4c15-8C4B-E77F1DB2D793 {
 ################################################################################\r
 \r
 [FV.DXEFV]\r
+FvNameGuid         = 8063C21A-8E58-4576-95CE-089E87975D23\r
 BlockSize          = $(FD_BLOCK_SIZE)\r
 FvForceRebase      = FALSE\r
 FvAlignment        = 16\r
@@ -83,6 +86,8 @@ READ_LOCK_STATUS   = TRUE
 APRIORI DXE {\r
   INF  MdeModulePkg/Universal/DevicePathDxe/DevicePathDxe.inf\r
   INF  MdeModulePkg/Universal/PCD/Dxe/Pcd.inf\r
+  INF  MdeModulePkg/Universal/ReportStatusCodeRouter/RuntimeDxe/ReportStatusCodeRouterRuntimeDxe.inf\r
+  INF  MdeModulePkg/Universal/StatusCodeHandler/RuntimeDxe/StatusCodeHandlerRuntimeDxe.inf\r
   INF  UefiPayloadPkg/BlSupportDxe/BlSupportDxe.inf\r
 }\r
 \r
@@ -94,29 +99,76 @@ 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
 INF MdeModulePkg/Universal/WatchdogTimerDxe/WatchdogTimer.inf\r
 INF MdeModulePkg/Core/RuntimeDxe/RuntimeDxe.inf\r
 INF MdeModulePkg/Universal/CapsuleRuntimeDxe/CapsuleRuntimeDxe.inf\r
 INF MdeModulePkg/Universal/MonotonicCounterRuntimeDxe/MonotonicCounterRuntimeDxe.inf\r
+\r
+!if $(DISABLE_RESET_SYSTEM) == FALSE\r
 INF MdeModulePkg/Universal/ResetSystemRuntimeDxe/ResetSystemRuntimeDxe.inf\r
+!endif\r
 INF PcAtChipsetPkg/PcatRealTimeClockRuntimeDxe/PcatRealTimeClockRuntimeDxe.inf\r
-INF MdeModulePkg/Universal/Variable/RuntimeDxe/VariableRuntimeDxe.inf\r
+!if $(PERFORMANCE_MEASUREMENT_ENABLE)\r
+  INF MdeModulePkg/Universal/Acpi/FirmwarePerformanceDataTableDxe/FirmwarePerformanceDxe.inf\r
+!endif\r
+\r
+#\r
+# SMM Support\r
+#\r
+!if $(SMM_SUPPORT) == TRUE\r
+  INF UefiPayloadPkg/SmmAccessDxe/SmmAccessDxe.inf\r
+  INF UefiPayloadPkg/SmmControlRuntimeDxe/SmmControlRuntimeDxe.inf\r
+  INF UefiPayloadPkg/BlSupportSmm/BlSupportSmm.inf\r
+  INF MdeModulePkg/Core/PiSmmCore/PiSmmIpl.inf\r
+  INF MdeModulePkg/Core/PiSmmCore/PiSmmCore.inf\r
+  INF UefiCpuPkg/CpuIo2Smm/CpuIo2Smm.inf\r
+  INF UefiCpuPkg/PiSmmCpuDxeSmm/PiSmmCpuDxeSmm.inf\r
+  INF UefiPayloadPkg/PchSmiDispatchSmm/PchSmiDispatchSmm.inf\r
+!if $(PERFORMANCE_MEASUREMENT_ENABLE)\r
+  INF  MdeModulePkg/Universal/Acpi/FirmwarePerformanceDataTableSmm/FirmwarePerformanceSmm.inf\r
+!endif\r
+!endif\r
+\r
+!if $(VARIABLE_SUPPORT) == "EMU"\r
+  INF MdeModulePkg/Universal/Variable/RuntimeDxe/VariableRuntimeDxe.inf\r
+!elseif $(VARIABLE_SUPPORT) == "SPI"\r
+  INF UefiPayloadPkg/FvbRuntimeDxe/FvbSmm.inf\r
+  INF MdeModulePkg/Universal/FaultTolerantWriteDxe/FaultTolerantWriteSmm.inf\r
+  INF MdeModulePkg/Universal/Variable/RuntimeDxe/VariableSmm.inf\r
+  INF MdeModulePkg/Universal/Variable/RuntimeDxe/VariableSmmRuntimeDxe.inf\r
+!endif\r
 \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
+INF MdeModulePkg/Universal/PlatformDriOverrideDxe/PlatformDriOverrideDxe.inf\r
+INF MdeModulePkg/Universal/EbcDxe/EbcDxe.inf\r
 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
@@ -126,11 +178,18 @@ INF MdeModulePkg/Bus/Pci/PciHostBridgeDxe/PciHostBridgeDxe.inf
 #\r
 # ISA Support\r
 #\r
+!if $(SERIAL_DRIVER_ENABLE) == TRUE\r
 INF MdeModulePkg/Universal/SerialDxe/SerialDxe.inf\r
-!if $(PS2_KEYBOARD_ENABLE) == TRUE\r
+!endif\r
+!if $(SIO_BUS_ENABLE) == TRUE\r
 INF OvmfPkg/SioBusDxe/SioBusDxe.inf\r
+!endif\r
+!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
@@ -149,21 +208,29 @@ 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
-\r
+!endif\r
+!if $(RAM_DISK_ENABLE) == TRUE\r
+INF MdeModulePkg/Universal/Disk/RamDiskDxe/RamDiskDxe.inf\r
+!endif\r
 INF FatPkg/EnhancedFatDxe/Fat.inf\r
 \r
 #\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
@@ -174,35 +241,33 @@ INF MdeModulePkg/Bus/Pci/XhciDxe/XhciDxe.inf
 INF MdeModulePkg/Bus/Usb/UsbBusDxe/UsbBusDxe.inf\r
 INF MdeModulePkg/Bus/Usb/UsbKbDxe/UsbKbDxe.inf\r
 INF MdeModulePkg/Bus/Usb/UsbMassStorageDxe/UsbMassStorageDxe.inf\r
+INF MdeModulePkg/Bus/Usb/UsbMouseDxe/UsbMouseDxe.inf\r
 \r
 #\r
 # 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
+#\r
+!if $(NETWORK_DRIVER_ENABLE) == TRUE\r
+  !include NetworkPkg/Network.fdf.inc\r
+!endif\r
 \r
 #\r
 # Shell\r
 #\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
-INF ShellPkg/Application/Shell/Shell.inf\r
-!endif\r
-\r
-!if $(SHELL_TYPE) == MIN_BIN\r
-!if $(ARCH) == IA32\r
-INF  RuleOverride = BINARY USE = IA32 ShellBinPkg/MinUefiShell/MinUefiShell.inf\r
-!else\r
-INF  RuleOverride = BINARY USE = X64 ShellBinPkg/MinUefiShell/MinUefiShell.inf\r
-!endif\r
-!endif\r
-\r
-!if $(SHELL_TYPE) == UEFI_BIN\r
-!if $(ARCH) == IA32\r
-INF  RuleOverride = BINARY USE = IA32 ShellBinPkg/UefiShell/UefiShell.inf\r
-!else\r
-INF  RuleOverride = BINARY USE = X64 ShellBinPkg/UefiShell/UefiShell.inf\r
 !endif\r
+INF ShellPkg/Application/Shell/Shell.inf\r
 !endif\r
 \r
 \r
@@ -257,6 +322,20 @@ INF  RuleOverride = BINARY USE = X64 ShellBinPkg/UefiShell/UefiShell.inf
     UI       STRING="$(MODULE_NAME)" Optional\r
     VERSION  STRING="$(INF_VERSION)" Optional BUILD_NUM=$(BUILD_NUMBER)\r
   }\r
+[Rule.Common.DXE_SMM_DRIVER]\r
+  FILE SMM = $(NAMED_GUID) {\r
+    SMM_DEPEX SMM_DEPEX Optional       $(INF_OUTPUT)/$(MODULE_NAME).depex\r
+    PE32      PE32                     $(INF_OUTPUT)/$(MODULE_NAME).efi\r
+    UI        STRING="$(MODULE_NAME)" Optional\r
+    VERSION   STRING="$(INF_VERSION)" Optional BUILD_NUM=$(BUILD_NUMBER)\r
+  }\r
+\r
+[Rule.Common.SMM_CORE]\r
+  FILE SMM_CORE = $(NAMED_GUID) {\r
+    PE32     PE32                    $(INF_OUTPUT)/$(MODULE_NAME).efi\r
+    UI       STRING="$(MODULE_NAME)" Optional\r
+    VERSION  STRING="$(INF_VERSION)" Optional BUILD_NUM=$(BUILD_NUMBER)\r
+  }\r
 \r
 [Rule.Common.UEFI_DRIVER]\r
   FILE DRIVER = $(NAMED_GUID) {\r
@@ -303,3 +382,10 @@ INF  RuleOverride = BINARY USE = X64 ShellBinPkg/UefiShell/UefiShell.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