diff options
| author | Guo Dong <guo.dong@intel.com> | 2020-07-13 08:49:56 -0700 |
|---|---|---|
| committer | mergify[bot] <37929162+mergify[bot]@users.noreply.github.com> | 2020-07-13 15:57:31 +0000 |
| commit | d9a4084544134eea50f62e88d79c466ae91f0455 (patch) | |
| tree | 1d3850226e7c0627f4969898e82f659153786819 /UefiPayloadPkg | |
| parent | f45e3a4afa65a45ea1a956a7c5e7410ff40190d1 (diff) | |
| download | edk2-d9a4084544134eea50f62e88d79c466ae91f0455.tar.gz edk2-d9a4084544134eea50f62e88d79c466ae91f0455.tar.bz2 edk2-d9a4084544134eea50f62e88d79c466ae91f0455.zip | |
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>
Diffstat (limited to 'UefiPayloadPkg')
| -rw-r--r-- | UefiPayloadPkg/UefiPayloadPkgIa32.dsc | 4 | ||||
| -rw-r--r-- | UefiPayloadPkg/UefiPayloadPkgIa32X64.dsc | 4 |
2 files changed, 4 insertions, 4 deletions
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
#------------------------------
|