UefiPayloadPkg: Fix TerminalDxe build time configurable

This patch fixed the merge issue for the previous TerminalDxe patch.

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/UefiPayloadPkgIa32.dsc b/UefiPayloadPkg/UefiPayloadPkgIa32.dsc
index 6ac10f086bf963123e4eb7c0d664d4ef5bbde33f..9a9ca3060e47a12ef2e93ea475e6ead733475165 100644 (file)
--- a/UefiPayloadPkg/UefiPayloadPkgIa32.dsc
+++ b/UefiPayloadPkg/UefiPayloadPkgIa32.dsc
@@ -506,10 +506,10 @@
   #\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
+!if $(DISABLE_SERIAL_TERMINAL) == FALSE\r
   MdeModulePkg/Universal/Console/TerminalDxe/TerminalDxe.inf\r
+!endif\r
   UefiPayloadPkg/GraphicsOutputDxe/GraphicsOutputDxe.inf\r
 \r
   #------------------------------\r

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