Hello Guo,

regarding the master commit 48aa2edf5dae7a1e819ae01c43a326b6c97f20b1, I
noticed that the patch was not merged properly.
Instead of making TerminalDxe depend on DISABLE_SERIAL_TERMINAL,  it does
apply it to GraphicsConsoleDxe.
Therefore it does not work as expected. Did this happen by mistake?

Best regards,
Marcello

PS: Here is a diff of the commit in the master branch compared to my
submission:

diff --git a/UefiPayloadPkg/UefiPayloadPkgIa32.dsc
b/UefiPayloadPkg/UefiPayloadPkgIa32.dsc
index 9aab54461986..1a8b1792f24c 100644
--- a/UefiPayloadPkg/UefiPayloadPkgIa32.dsc
+++ b/UefiPayloadPkg/UefiPayloadPkgIa32.dsc
@@ -506,10 +506,10 @@ [Components.IA32]
   #
   MdeModulePkg/Universal/Console/ConPlatformDxe/ConPlatformDxe.inf
   MdeModulePkg/Universal/Console/ConSplitterDxe/ConSplitterDxe.inf
-  MdeModulePkg/Universal/Console/GraphicsConsoleDxe/GraphicsConsoleDxe.inf
 !if $(DISABLE_SERIAL_TERMINAL) == FALSE
+  MdeModulePkg/Universal/Console/GraphicsConsoleDxe/GraphicsConsoleDxe.inf
+!endif
   MdeModulePkg/Universal/Console/TerminalDxe/TerminalDxe.inf
-!endif
   UefiPayloadPkg/GraphicsOutputDxe/GraphicsOutputDxe.inf

   #------------------------------
diff --git a/UefiPayloadPkg/UefiPayloadPkgIa32X64.dsc
b/UefiPayloadPkg/UefiPayloadPkgIa32X64.dsc
index a768a8702c66..650a72162a29 100644
--- a/UefiPayloadPkg/UefiPayloadPkgIa32X64.dsc
+++ b/UefiPayloadPkg/UefiPayloadPkgIa32X64.dsc
@@ -507,10 +507,10 @@ [Components.X64]
   #
   MdeModulePkg/Universal/Console/ConPlatformDxe/ConPlatformDxe.inf
   MdeModulePkg/Universal/Console/ConSplitterDxe/ConSplitterDxe.inf
-  MdeModulePkg/Universal/Console/GraphicsConsoleDxe/GraphicsConsoleDxe.inf
 !if $(DISABLE_SERIAL_TERMINAL) == FALSE
+  MdeModulePkg/Universal/Console/GraphicsConsoleDxe/GraphicsConsoleDxe.inf
+!endif
   MdeModulePkg/Universal/Console/TerminalDxe/TerminalDxe.inf
-!endif
   UefiPayloadPkg/GraphicsOutputDxe/GraphicsOutputDxe.inf

   #------------------------------

On Wed, Jun 24, 2020 at 4:32 PM Dong, Guo <guo.dong@intel.com> wrote:

>
> Reviewed-by: Dong, Guo <guo.dong@intel.com>
>
> Thanks,
> Guo
>
> > -----Original Message-----
> > From: Marcello Sylvester Bauer <marcello.bauer@9elements.com>
> > Sent: Wednesday, June 24, 2020 2:58 AM
> > To: devel@edk2.groups.io
> > Cc: Patrick Rudolph <patrick.rudolph@9elements.com>; Christian Walter
> > <christian.walter@9elements.com>; Ma, Maurice <maurice.ma@intel.com>;
> > Dong, Guo <guo.dong@intel.com>; You, Benjamin
> > <benjamin.you@intel.com>
> > Subject: [PATCH v2 1/1] UefiPayloadPkg: Make TerminalDxe build time
> > configurable
> >
> > From: Patrick Rudolph <patrick.rudolph@9elements.com>
> >
> > 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>
> > Cc: Patrick Rudolph <patrick.rudolph@9elements.com>
> > Cc: Christian Walter <christian.walter@9elements.com>
> > Cc: Maurice Ma <maurice.ma@intel.com>
> > Cc: Guo Dong <guo.dong@intel.com>
> > Cc: Benjamin You <benjamin.you@intel.com>
> > ---
> >  UefiPayloadPkg/UefiPayloadPkgIa32.dsc    | 5 +++++
> >  UefiPayloadPkg/UefiPayloadPkgIa32X64.dsc | 5 +++++
> >  UefiPayloadPkg/UefiPayloadPkg.fdf        | 2 ++
> >  3 files changed, 12 insertions(+)
> >
> > diff --git a/UefiPayloadPkg/UefiPayloadPkgIa32.dsc
> > b/UefiPayloadPkg/UefiPayloadPkgIa32.dsc
> > index c6c47833871b..49f42285882d 100644
> > --- a/UefiPayloadPkg/UefiPayloadPkgIa32.dsc
> > +++ b/UefiPayloadPkg/UefiPayloadPkgIa32.dsc
> > @@ -58,6 +58,9 @@ [Defines]
> >    DEFINE UART_DEFAULT_STOP_BITS       = 1
> >
> >    DEFINE DEFAULT_TERMINAL_TYPE        = 0
> >
> >
> >
> > +  # Enabling the serial terminal will slow down the boot menu rendering!
> >
> > +  DEFINE DISABLE_SERIAL_TERMINAL      = FALSE
> >
> > +
> >
> >    #
> >
> >    #  typedef struct {
> >
> >    #    UINT16  VendorId;          ///< Vendor ID to match the PCI
> device.  The
> > value 0xFFFF terminates the list of entries.
> >
> > @@ -502,7 +505,9 @@ [Components.IA32]
> >    MdeModulePkg/Universal/Console/ConPlatformDxe/ConPlatformDxe.inf
> >
> >    MdeModulePkg/Universal/Console/ConSplitterDxe/ConSplitterDxe.inf
> >
> >
> > MdeModulePkg/Universal/Console/GraphicsConsoleDxe/GraphicsConsoleD
> > xe.inf
> >
> > +!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 5559b1258521..33805902f705 100644
> > --- a/UefiPayloadPkg/UefiPayloadPkgIa32X64.dsc
> > +++ b/UefiPayloadPkg/UefiPayloadPkgIa32X64.dsc
> > @@ -59,6 +59,9 @@ [Defines]
> >    DEFINE UART_DEFAULT_STOP_BITS       = 1
> >
> >    DEFINE DEFAULT_TERMINAL_TYPE        = 0
> >
> >
> >
> > +  # Enabling the serial terminal will slow down the boot menu redering!
> >
> > +  DEFINE DISABLE_SERIAL_TERMINAL      = FALSE
> >
> > +
> >
> >    #
> >
> >    #  typedef struct {
> >
> >    #    UINT16  VendorId;          ///< Vendor ID to match the PCI
> device.  The
> > value 0xFFFF terminates the list of entries.
> >
> > @@ -504,7 +507,9 @@ [Components.X64]
> >    MdeModulePkg/Universal/Console/ConPlatformDxe/ConPlatformDxe.inf
> >
> >    MdeModulePkg/Universal/Console/ConSplitterDxe/ConSplitterDxe.inf
> >
> >
> > MdeModulePkg/Universal/Console/GraphicsConsoleDxe/GraphicsConsoleD
> > xe.inf
> >
> > +!if $(DISABLE_SERIAL_TERMINAL) == FALSE
> >
> >    MdeModulePkg/Universal/Console/TerminalDxe/TerminalDxe.inf
> >
> > +!endif
> >
> >    UefiPayloadPkg/GraphicsOutputDxe/GraphicsOutputDxe.inf
> >
> >
> >
> >    #------------------------------
> >
> > diff --git a/UefiPayloadPkg/UefiPayloadPkg.fdf
> > b/UefiPayloadPkg/UefiPayloadPkg.fdf
> > index dfbcde566849..03ff6a9595d1 100644
> > --- a/UefiPayloadPkg/UefiPayloadPkg.fdf
> > +++ b/UefiPayloadPkg/UefiPayloadPkg.fdf
> > @@ -131,7 +131,9 @@ [FV.DXEFV]
> >  INF
> > MdeModulePkg/Universal/Console/ConPlatformDxe/ConPlatformDxe.inf
> >
> >  INF MdeModulePkg/Universal/Console/ConSplitterDxe/ConSplitterDxe.inf
> >
> >  INF
> > MdeModulePkg/Universal/Console/GraphicsConsoleDxe/GraphicsConsoleD
> > xe.inf
> >
> > +!if $(DISABLE_SERIAL_TERMINAL) == FALSE
> >
> >  INF MdeModulePkg/Universal/Console/TerminalDxe/TerminalDxe.inf
> >
> > +!endif
> >
> >  INF UefiPayloadPkg/GraphicsOutputDxe/GraphicsOutputDxe.inf
> >
> >
> >
> >  #
> >
> > --
> > 2.25.4
>
>

-- 
*[Marcello Sylvester Bauer]*



9elements Agency GmbH, Kortumstraße 19-21, 44787 Bochum, Germany
Email:  [DEINE EMAIL ADDRESSE]
<https://static.9elements.com/email_signatur.html>
Phone:  *+49 234 68 94 188 <+492346894188>*
Mobile:  *+49 1722847618 <+491722847618>*

Sitz der Gesellschaft: Bochum
Handelsregister: Amtsgericht Bochum, HRB 17519
Geschäftsführung: Sebastian Deutsch, Eray Basar

Datenschutzhinweise nach Art. 13 DSGVO <https://9elements.com/privacy>