From: Guo Dong Date: Mon, 13 Jul 2020 15:49:56 +0000 (-0700) Subject: UefiPayloadPkg: Fix TerminalDxe build time configurable X-Git-Tag: edk2-stable202008~274 X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=d9a4084544134eea50f62e88d79c466ae91f0455;p=mirror_edk2.git UefiPayloadPkg: Fix TerminalDxe build time configurable This patch fixed the merge issue for the previous TerminalDxe patch. Signed-off-by: Patrick Rudolph Signed-off-by: Marcello Sylvester Bauer Reviewed-by: Maurice Ma Reviewed-by: Guo Dong --- diff --git a/UefiPayloadPkg/UefiPayloadPkgIa32.dsc b/UefiPayloadPkg/UefiPayloadPkgIa32.dsc index 6ac10f086b..9a9ca3060e 100644 --- a/UefiPayloadPkg/UefiPayloadPkgIa32.dsc +++ b/UefiPayloadPkg/UefiPayloadPkgIa32.dsc @@ -506,10 +506,10 @@ # MdeModulePkg/Universal/Console/ConPlatformDxe/ConPlatformDxe.inf MdeModulePkg/Universal/Console/ConSplitterDxe/ConSplitterDxe.inf -!if $(DISABLE_SERIAL_TERMINAL) == FALSE MdeModulePkg/Universal/Console/GraphicsConsoleDxe/GraphicsConsoleDxe.inf -!endif +!if $(DISABLE_SERIAL_TERMINAL) == FALSE MdeModulePkg/Universal/Console/TerminalDxe/TerminalDxe.inf +!endif UefiPayloadPkg/GraphicsOutputDxe/GraphicsOutputDxe.inf #------------------------------ diff --git a/UefiPayloadPkg/UefiPayloadPkgIa32X64.dsc b/UefiPayloadPkg/UefiPayloadPkgIa32X64.dsc index 650a72162a..a768a8702c 100644 --- a/UefiPayloadPkg/UefiPayloadPkgIa32X64.dsc +++ b/UefiPayloadPkg/UefiPayloadPkgIa32X64.dsc @@ -507,10 +507,10 @@ # MdeModulePkg/Universal/Console/ConPlatformDxe/ConPlatformDxe.inf MdeModulePkg/Universal/Console/ConSplitterDxe/ConSplitterDxe.inf -!if $(DISABLE_SERIAL_TERMINAL) == FALSE MdeModulePkg/Universal/Console/GraphicsConsoleDxe/GraphicsConsoleDxe.inf -!endif +!if $(DISABLE_SERIAL_TERMINAL) == FALSE MdeModulePkg/Universal/Console/TerminalDxe/TerminalDxe.inf +!endif UefiPayloadPkg/GraphicsOutputDxe/GraphicsOutputDxe.inf #------------------------------