UefiPayloadPkg: Make TerminalDxe build time configurable

As the TerminalDxe significantly slows down the boot menu rendering,
add the DISABLE_SERIAL_TERMINAL option to disable it at build time.

Signed-off-by: Patrick Rudolph <patrick.rudolph@9elements.com>
Signed-off-by: Marcello Sylvester Bauer <marcello.bauer@9elements.com>
Reviewed-by: Maurice Ma <maurice.ma@intel.com>
Reviewed-by: Guo Dong <guo.dong@intel.com>

diff --git a/UefiPayloadPkg/UefiPayloadPkg.fdf b/UefiPayloadPkg/UefiPayloadPkg.fdf
index a04fcd2ec23b8a9a5cddffb683f951dd1b93fc3f..570a8ee7fdc16b683b0607eb1ee78fd897344a2b 100644 (file)
--- a/UefiPayloadPkg/UefiPayloadPkg.fdf
+++ b/UefiPayloadPkg/UefiPayloadPkg.fdf
@@ -147,7 +147,9 @@ INF MdeModulePkg/Bus/Isa/Ps2KeyboardDxe/Ps2KeyboardDxe.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

diff --git a/UefiPayloadPkg/UefiPayloadPkgIa32.dsc b/UefiPayloadPkg/UefiPayloadPkgIa32.dsc
index 0efcfa8fb2f47ee19732717ed0f9dfafef4c711f..6ac10f086bf963123e4eb7c0d664d4ef5bbde33f 100644 (file)
--- a/UefiPayloadPkg/UefiPayloadPkgIa32.dsc
+++ b/UefiPayloadPkg/UefiPayloadPkgIa32.dsc
@@ -58,6 +58,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
@@ -503,7 +506,9 @@
   #\r
   MdeModulePkg/Universal/Console/ConPlatformDxe/ConPlatformDxe.inf\r
   MdeModulePkg/Universal/Console/ConSplitterDxe/ConSplitterDxe.inf\r
+!if $(DISABLE_SERIAL_TERMINAL) == FALSE\r
   MdeModulePkg/Universal/Console/GraphicsConsoleDxe/GraphicsConsoleDxe.inf\r
+!endif\r
   MdeModulePkg/Universal/Console/TerminalDxe/TerminalDxe.inf\r
   UefiPayloadPkg/GraphicsOutputDxe/GraphicsOutputDxe.inf\r
 \r

diff --git a/UefiPayloadPkg/UefiPayloadPkgIa32X64.dsc b/UefiPayloadPkg/UefiPayloadPkgIa32X64.dsc
index d645d233cd08ded52cac2ddf82b4dc460abdd60e..650a72162a29c3bf67e2d79356f1bf920bacb0a5 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
@@ -504,7 +507,9 @@
   #\r
   MdeModulePkg/Universal/Console/ConPlatformDxe/ConPlatformDxe.inf\r
   MdeModulePkg/Universal/Console/ConSplitterDxe/ConSplitterDxe.inf\r
+!if $(DISABLE_SERIAL_TERMINAL) == FALSE\r
   MdeModulePkg/Universal/Console/GraphicsConsoleDxe/GraphicsConsoleDxe.inf\r
+!endif\r
   MdeModulePkg/Universal/Console/TerminalDxe/TerminalDxe.inf\r
   UefiPayloadPkg/GraphicsOutputDxe/GraphicsOutputDxe.inf\r
 \r