UefiPayloadPkg: Support variable size MMCONF space

[mirror_edk2.git] / UefiPayloadPkg / UefiPayloadPkgIa32X64.dsc

diff --git a/UefiPayloadPkg/UefiPayloadPkgIa32X64.dsc b/UefiPayloadPkg/UefiPayloadPkgIa32X64.dsc
index d645d233cd08ded52cac2ddf82b4dc460abdd60e..e18c4678e8e30812a23fb37d2c0fd0a4adb56e46 100644 (file)
--- a/UefiPayloadPkg/UefiPayloadPkgIa32X64.dsc
+++ b/UefiPayloadPkg/UefiPayloadPkgIa32X64.dsc
@@ -59,6 +59,9 @@
   DEFINE UART_DEFAULT_STOP_BITS       = 1\r
   DEFINE DEFAULT_TERMINAL_TYPE        = 0\r
 \r
+  # Enabling the serial terminal will slow down the boot menu redering!\r
+  DEFINE DISABLE_SERIAL_TERMINAL      = FALSE\r
+\r
   #\r
   #  typedef struct {\r
   #    UINT16  VendorId;          ///< Vendor ID to match the PCI device.  The value 0xFFFF terminates the list of entries.\r
@@ -235,6 +238,7 @@
   DebugAgentLib|SourceLevelDebugPkg/Library/DebugAgent/DxeDebugAgentLib.inf\r
 !endif\r
   CpuExceptionHandlerLib|UefiCpuPkg/Library/CpuExceptionHandlerLib/DxeCpuExceptionHandlerLib.inf\r
+  VmgExitLib|UefiCpuPkg/Library/VmgExitLibNull/VmgExitLibNull.inf\r
 \r
 [LibraryClasses.common.DXE_DRIVER]\r
   PcdLib|MdePkg/Library/DxePcdLib/DxePcdLib.inf\r
@@ -247,6 +251,7 @@
 !endif\r
   CpuExceptionHandlerLib|UefiCpuPkg/Library/CpuExceptionHandlerLib/DxeCpuExceptionHandlerLib.inf\r
   MpInitLib|UefiCpuPkg/Library/MpInitLib/DxeMpInitLib.inf\r
+  VmgExitLib|UefiCpuPkg/Library/VmgExitLibNull/VmgExitLibNull.inf\r
 \r
 [LibraryClasses.common.DXE_RUNTIME_DRIVER]\r
   PcdLib|MdePkg/Library/DxePcdLib/DxePcdLib.inf\r
@@ -307,7 +312,7 @@
   # The following parameters are set by Library/PlatformHookLib\r
   #\r
   gEfiMdeModulePkgTokenSpaceGuid.PcdSerialUseMmio|FALSE\r
-  gEfiMdeModulePkgTokenSpaceGuid.PcdSerialRegisterBase|0x3f8\r
+  gEfiMdeModulePkgTokenSpaceGuid.PcdSerialRegisterBase|0\r
   gEfiMdeModulePkgTokenSpaceGuid.PcdSerialBaudRate|$(BAUD_RATE)\r
   gEfiMdeModulePkgTokenSpaceGuid.PcdSerialRegisterStride|1\r
 \r
@@ -360,6 +365,7 @@
   gEfiMdeModulePkgTokenSpaceGuid.PcdConOutRow|31\r
   gEfiMdeModulePkgTokenSpaceGuid.PcdConOutColumn|100\r
   gEfiMdePkgTokenSpaceGuid.PcdPciExpressBaseAddress|0\r
+  gEfiMdePkgTokenSpaceGuid.PcdPciExpressBaseSize|0\r
 \r
 ################################################################################\r
 #\r
@@ -505,7 +511,9 @@
   MdeModulePkg/Universal/Console/ConPlatformDxe/ConPlatformDxe.inf\r
   MdeModulePkg/Universal/Console/ConSplitterDxe/ConSplitterDxe.inf\r
   MdeModulePkg/Universal/Console/GraphicsConsoleDxe/GraphicsConsoleDxe.inf\r
+!if $(DISABLE_SERIAL_TERMINAL) == FALSE\r
   MdeModulePkg/Universal/Console/TerminalDxe/TerminalDxe.inf\r
+!endif\r
   UefiPayloadPkg/GraphicsOutputDxe/GraphicsOutputDxe.inf\r
 \r
   #------------------------------\r