OvmfPkg/OvmfPkg.ci.yaml: Add configuration for Ecc check

[mirror_edk2.git] / UefiPayloadPkg / UefiPayloadPkg.fdf

diff --git a/UefiPayloadPkg/UefiPayloadPkg.fdf b/UefiPayloadPkg/UefiPayloadPkg.fdf
index ce3b34999beaf3373528e461404db69b60806b85..570a8ee7fdc16b683b0607eb1ee78fd897344a2b 100644 (file)
--- a/UefiPayloadPkg/UefiPayloadPkg.fdf
+++ b/UefiPayloadPkg/UefiPayloadPkg.fdf
@@ -8,23 +8,39 @@
 #\r
 ##\r
 \r
+[Defines]\r
+DEFINE FD_BASE       = 0x00800000\r
+DEFINE FD_BLOCK_SIZE = 0x00001000\r
+\r
+!if $(TARGET) == "NOOPT"\r
+DEFINE PEI_FV_SIZE = 0x00050000\r
+DEFINE DXE_FV_SIZE = 0x00800000\r
+DEFINE FD_SIZE     = 0x00850000\r
+DEFINE NUM_BLOCKS  = 0x850\r
+!else\r
+DEFINE PEI_FV_SIZE = 0x30000\r
+DEFINE DXE_FV_SIZE = 0x3E0000\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
+BlockSize     = $(FD_BLOCK_SIZE)\r
+NumBlocks     = $(NUM_BLOCKS)\r
 \r
-0x00000000|0x030000\r
+0x00000000|$(PEI_FV_SIZE)\r
 FV = PEIFV\r
 \r
-0x00030000|0x3E0000\r
+$(PEI_FV_SIZE)|$(DXE_FV_SIZE)\r
 FV = DXEFV\r
 \r
 ################################################################################\r
 [FV.PEIFV]\r
-BlockSize          = 0x1000\r
+BlockSize          = $(FD_BLOCK_SIZE)\r
 FvAlignment        = 16\r
 ERASE_POLARITY     = 1\r
 MEMORY_MAPPED      = TRUE\r
@@ -54,7 +70,7 @@ INF MdeModulePkg/Core/DxeIplPeim/DxeIpl.inf
 ################################################################################\r
 \r
 [FV.DXEFV]\r
-BlockSize          = 0x1000\r
+BlockSize          = $(FD_BLOCK_SIZE)\r
 FvForceRebase      = FALSE\r
 FvAlignment        = 16\r
 ERASE_POLARITY     = 1\r
@@ -104,7 +120,6 @@ INF MdeModulePkg/Universal/Variable/RuntimeDxe/VariableRuntimeDxe.inf
 INF UefiCpuPkg/CpuIo2Dxe/CpuIo2Dxe.inf\r
 INF MdeModulePkg/Universal/DevicePathDxe/DevicePathDxe.inf\r
 INF MdeModulePkg/Universal/MemoryTest/NullMemoryTestDxe/NullMemoryTestDxe.inf\r
-INF PcAtChipsetPkg/8259InterruptControllerDxe/8259.inf\r
 INF MdeModulePkg/Universal/HiiDatabaseDxe/HiiDatabaseDxe.inf\r
 INF MdeModulePkg/Universal/SetupBrowserDxe/SetupBrowserDxe.inf\r
 INF MdeModulePkg/Universal/DisplayEngineDxe/DisplayEngineDxe.inf\r
@@ -121,6 +136,10 @@ INF MdeModulePkg/Bus/Pci/PciHostBridgeDxe/PciHostBridgeDxe.inf
 # ISA Support\r
 #\r
 INF MdeModulePkg/Universal/SerialDxe/SerialDxe.inf\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
@@ -128,7 +147,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