RedfishPkg: Fix various typos

[mirror_edk2.git] / UefiPayloadPkg / UefiPayloadPkg.fdf

diff --git a/UefiPayloadPkg/UefiPayloadPkg.fdf b/UefiPayloadPkg/UefiPayloadPkg.fdf
index 4cd88a3f855d3213debc2b9345aed55d383db29c..5871d71dbb75748bf8eb5dfaa6037479c6dd0031 100644 (file)
--- a/UefiPayloadPkg/UefiPayloadPkg.fdf
+++ b/UefiPayloadPkg/UefiPayloadPkg.fdf
@@ -3,28 +3,39 @@
 #\r
 # Provides drivers and definitions to create uefi payload for bootloaders.\r
 #\r
-# Copyright (c) 2014 - 2019, Intel Corporation. All rights reserved.<BR>\r
+# Copyright (c) 2014 - 2020, Intel Corporation. All rights reserved.<BR>\r
 # SPDX-License-Identifier: BSD-2-Clause-Patent\r
 #\r
 ##\r
 \r
+[Defines]\r
+DEFINE FD_BASE       = 0x00800000\r
+DEFINE FD_BLOCK_SIZE = 0x00001000\r
+\r
+!if $(TARGET) == "NOOPT"\r
+DEFINE FD_SIZE     = 0x00850000\r
+DEFINE NUM_BLOCKS  = 0x850\r
+!else\r
+\r
+DEFINE FD_SIZE     = 0x00410000\r
+DEFINE NUM_BLOCKS  = 0x410\r
+!endif\r
+\r
 ################################################################################\r
 [FD.UefiPayload]\r
-BaseAddress   = 0x800000|gUefiPayloadPkgTokenSpaceGuid.PcdPayloadFdMemBase\r
-Size          = 0x410000|gUefiPayloadPkgTokenSpaceGuid.PcdPayloadFdMemSize\r
+BaseAddress   = $(FD_BASE) | gUefiPayloadPkgTokenSpaceGuid.PcdPayloadFdMemBase\r
+Size          = $(FD_SIZE) | gUefiPayloadPkgTokenSpaceGuid.PcdPayloadFdMemSize\r
 ErasePolarity = 1\r
-BlockSize     = 0x1000\r
-NumBlocks     = 0x410\r
-\r
-0x00000000|0x030000\r
-FV = PEIFV\r
+BlockSize     = $(FD_BLOCK_SIZE)\r
+NumBlocks     = $(NUM_BLOCKS)\r
 \r
-0x00030000|0x3E0000\r
-FV = DXEFV\r
+0x00000000|$(FD_SIZE)\r
+FV = PLDFV\r
 \r
 ################################################################################\r
-[FV.PEIFV]\r
-BlockSize          = 0x1000\r
+[FV.PLDFV]\r
+FvNameGuid         = 96E75986-6FDD-491E-9FD5-35E21AC45B45\r
+BlockSize          = $(FD_BLOCK_SIZE)\r
 FvAlignment        = 16\r
 ERASE_POLARITY     = 1\r
 MEMORY_MAPPED      = TRUE\r
@@ -42,19 +53,18 @@ READ_STATUS        = TRUE
 READ_LOCK_CAP      = TRUE\r
 READ_LOCK_STATUS   = TRUE\r
 \r
-INF UefiPayloadPkg/SecCore/SecCore.inf\r
-\r
-INF MdeModulePkg/Core/Pei/PeiMain.inf\r
-INF MdeModulePkg/Universal/PCD/Pei/Pcd.inf\r
-INF MdeModulePkg/Universal/ReportStatusCodeRouter/Pei/ReportStatusCodeRouterPei.inf\r
-INF MdeModulePkg/Universal/StatusCodeHandler/Pei/StatusCodeHandlerPei.inf\r
-INF UefiPayloadPkg/BlSupportPei/BlSupportPei.inf\r
-INF MdeModulePkg/Core/DxeIplPeim/DxeIpl.inf\r
+!if $(UNIVERSAL_PAYLOAD) == FALSE\r
+INF UefiPayloadPkg/UefiPayloadEntry/UefiPayloadEntry.inf\r
+!endif\r
+FILE FV_IMAGE = 4E35FD93-9C72-4c15-8C4B-E77F1DB2D793 {\r
+    SECTION FV_IMAGE = DXEFV\r
+}\r
 \r
 ################################################################################\r
 \r
 [FV.DXEFV]\r
-BlockSize          = 0x1000\r
+FvNameGuid         = 8063C21A-8E58-4576-95CE-089E87975D23\r
+BlockSize          = $(FD_BLOCK_SIZE)\r
 FvForceRebase      = FALSE\r
 FvAlignment        = 16\r
 ERASE_POLARITY     = 1\r
@@ -74,9 +84,9 @@ READ_LOCK_CAP      = TRUE
 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  MdeModulePkg/Universal/ReportStatusCodeRouter/RuntimeDxe/ReportStatusCodeRouterRuntimeDxe.inf\r
-  INF  MdeModulePkg/Universal/StatusCodeHandler/RuntimeDxe/StatusCodeHandlerRuntimeDxe.inf\r
+  INF  UefiPayloadPkg/BlSupportDxe/BlSupportDxe.inf\r
 }\r
 \r
 #\r
@@ -97,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
@@ -119,7 +136,13 @@ 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
+!endif\r
 \r
 #\r
 # Console Support\r
@@ -127,7 +150,9 @@ INF MdeModulePkg/Universal/SerialDxe/SerialDxe.inf
 INF MdeModulePkg/Universal/Console/ConPlatformDxe/ConPlatformDxe.inf\r
 INF MdeModulePkg/Universal/Console/ConSplitterDxe/ConSplitterDxe.inf\r
 INF MdeModulePkg/Universal/Console/GraphicsConsoleDxe/GraphicsConsoleDxe.inf\r
+!if $(DISABLE_SERIAL_TERMINAL) == FALSE\r
 INF MdeModulePkg/Universal/Console/TerminalDxe/TerminalDxe.inf\r
+!endif\r
 INF UefiPayloadPkg/GraphicsOutputDxe/GraphicsOutputDxe.inf\r
 \r
 #\r
@@ -141,6 +166,7 @@ INF MdeModulePkg/Bus/Ata/AtaBusDxe/AtaBusDxe.inf
 INF MdeModulePkg/Bus/Ata/AtaAtapiPassThru/AtaAtapiPassThru.inf\r
 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
 INF FatPkg/EnhancedFatDxe/Fat.inf\r
 \r
@@ -161,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
@@ -171,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