UefiPayloadPkg: Build a HOB from bootloader ACPI table

[mirror_edk2.git] / UefiPayloadPkg / UefiPayloadPkg.fdf

diff --git a/UefiPayloadPkg/UefiPayloadPkg.fdf b/UefiPayloadPkg/UefiPayloadPkg.fdf
index 8fc509024b250f42df2f3ad5798b730febaa1500..6b48bfc869b0ae9a7771a27f7d81d8061b6e9595 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
@@ -98,15 +101,23 @@ INF MdeModulePkg/Universal/SecurityStubDxe/SecurityStubDxe.inf
 INF UefiCpuPkg/CpuDxe/CpuDxe.inf\r
 INF MdeModulePkg/Universal/BdsDxe/BdsDxe.inf\r
 INF 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
+\r
 INF PcAtChipsetPkg/PcatRealTimeClockRuntimeDxe/PcatRealTimeClockRuntimeDxe.inf\r
+\r
+!if $(EMU_VARIABLE_ENABLE) == TRUE\r
 INF MdeModulePkg/Universal/Variable/RuntimeDxe/VariableRuntimeDxe.inf\r
+!endif\r
 \r
 INF UefiCpuPkg/CpuIo2Dxe/CpuIo2Dxe.inf\r
 INF MdeModulePkg/Universal/DevicePathDxe/DevicePathDxe.inf\r
@@ -114,6 +125,8 @@ INF MdeModulePkg/Universal/MemoryTest/NullMemoryTestDxe/NullMemoryTestDxe.inf
 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
@@ -126,11 +139,16 @@ 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
+INF MdeModulePkg/Bus/Isa/Ps2MouseDxe/Ps2MouseDxe.inf\r
 \r
 #\r
 # Console Support\r
@@ -155,7 +173,9 @@ INF MdeModulePkg/Bus/Ata/AtaAtapiPassThru/AtaAtapiPassThru.inf
 INF MdeModulePkg/Bus/Scsi/ScsiBusDxe/ScsiBusDxe.inf\r
 INF MdeModulePkg/Bus/Scsi/ScsiDiskDxe/ScsiDiskDxe.inf\r
 INF MdeModulePkg/Bus/Pci/NvmExpressDxe/NvmExpressDxe.inf\r
-\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
@@ -174,7 +194,19 @@ 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
+\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
@@ -185,22 +217,6 @@ INF ShellPkg/DynamicCommand/DpDynamicCommand/DpDynamicCommand.inf
 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
-!endif\r
-\r
 \r
 ################################################################################\r
 #\r