RedfishPkg: Fix various typos

[mirror_edk2.git] / UefiPayloadPkg / UefiPayloadPkg.fdf

diff --git a/UefiPayloadPkg/UefiPayloadPkg.fdf b/UefiPayloadPkg/UefiPayloadPkg.fdf
index 05c60ee955af0a765cee626f990b205bb7c35885..5871d71dbb75748bf8eb5dfaa6037479c6dd0031 100644 (file)
--- a/UefiPayloadPkg/UefiPayloadPkg.fdf
+++ b/UefiPayloadPkg/UefiPayloadPkg.fdf
@@ -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
@@ -80,6 +83,11 @@ READ_STATUS        = TRUE
 READ_LOCK_CAP      = TRUE\r
 READ_LOCK_STATUS   = TRUE\r
 \r
+APRIORI DXE {\r
+  INF  MdeModulePkg/Universal/DevicePathDxe/DevicePathDxe.inf\r
+  INF  MdeModulePkg/Universal/PCD/Dxe/Pcd.inf\r
+  INF  UefiPayloadPkg/BlSupportDxe/BlSupportDxe.inf\r
+}\r
 \r
 #\r
 # DXE Phase modules\r
@@ -99,9 +107,16 @@ INF MdeModulePkg/Universal/WatchdogTimerDxe/WatchdogTimer.inf
 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
@@ -121,7 +136,9 @@ 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
+!endif\r
 !if $(PS2_KEYBOARD_ENABLE) == TRUE\r
 INF OvmfPkg/SioBusDxe/SioBusDxe.inf\r
 INF MdeModulePkg/Bus/Isa/Ps2KeyboardDxe/Ps2KeyboardDxe.inf\r
@@ -170,6 +187,10 @@ INF MdeModulePkg/Bus/Usb/UsbBusDxe/UsbBusDxe.inf
 INF MdeModulePkg/Bus/Usb/UsbKbDxe/UsbKbDxe.inf\r
 INF MdeModulePkg/Bus/Usb/UsbMassStorageDxe/UsbMassStorageDxe.inf\r
 \r
+#\r
+# ACPI Support\r
+#\r
+INF  MdeModulePkg/Universal/Acpi/AcpiTableDxe/AcpiTableDxe.inf\r
 \r
 #\r
 # Shell\r
@@ -180,22 +201,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