From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-yb1-f171.google.com (mail-yb1-f171.google.com [209.85.219.171]) by mx.groups.io with SMTP id smtpd.web08.2060.1645557727888349669 for ; Tue, 22 Feb 2022 11:22:08 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@starlabs-systems.20210112.gappssmtp.com header.s=20210112 header.b=dx3WgZdw; spf=pass (domain: starlabs.systems, ip: 209.85.219.171, mailfrom: sean@starlabs.systems) Received: by mail-yb1-f171.google.com with SMTP id j12so43320708ybh.8 for ; Tue, 22 Feb 2022 11:22:07 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=starlabs-systems.20210112.gappssmtp.com; s=20210112; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=f2d7LWNir/TfuUGBaioaDBS4fK7B98hURALR1OtmlMk=; b=dx3WgZdwBZOrvzmwL6Oz4y33OJVoZhP2xICAMZ2L+VeufKQHOAQc619+tj+cOaNwaC DIiNhXKfAa1wyjBcmM+tbGSRYbxSVWyjg1Wm3pQLuLJM3eBZDc0OFQoSAWyW04PlRU8U yN3jsbePCFdBvmjV+wLKkNPrEoCTuOuSsRv3f62yjTJO79viwkHRw3iQ32whrLpWjylt iOC+8Lt7pII/YXQifRt15/bMjGU76TZbMQm+GvLZE81U+V/RYj/QoLGBABEItl6IA5q7 n8lQaPDcjzdUI6f+XUePHAVoGGadvW8ORopTX60LlD2AXyYVIVvQ0BlZ1lI9Mh1eqkS/ ribw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=f2d7LWNir/TfuUGBaioaDBS4fK7B98hURALR1OtmlMk=; b=Be1z0ZOlbRdzwN22/8VtHFzdBrrI2mNt0oIMUBab09aXQ2/B4JZTqPXaH5e7wWla5c GJtMuK/iMVnz9baod92tXEp31H9coolsgciBskcwnMo3h6vStaXJS6ELrz0QJaD48RRh LKKSorDwLYdlHZjxVatLz9LtJ9nb6VfEGL31JzRzQafFoLrB5jxdr52aplXMw+Aab/SS v0sCvqfipkPidqOfVKS2/RpGeGu9JH1rcgS0ACURFbM8faucc8Z6I0tZG52I/J7fB0tw emliKETvhmIqtjvJT+1H+/m70oe5Bnp7/cn2suxlbHFIyz8aZ26t0By7QqxTjcRqSw6y NsXA== X-Gm-Message-State: AOAM531z4ilH4jraEG/6bx/PEcDBjN6jx/Euq4vbSCeMZfF9Ecx3qhCM 5zPlPn/0C9nSByJksSX8JNTf19r9drvetPWGwrE1 X-Google-Smtp-Source: ABdhPJwbg5k6x6/jsP/5gPEmIL0z64TDXFpCYRW1KP0gkl9il5F+39S0GL1ei6OVFcifElBKuHE/EaOAyfTx08sIpek= X-Received: by 2002:a25:4186:0:b0:61e:181e:2237 with SMTP id o128-20020a254186000000b0061e181e2237mr23982160yba.125.1645557727000; Tue, 22 Feb 2022 11:22:07 -0800 (PST) MIME-Version: 1.0 References: <330fb76dffcd8ee2d3dfdbb395f1b1ae2707a6f3.1645393143.git.sean@starlabs.systems> In-Reply-To: From: "Sean Rhodes" Date: Tue, 22 Feb 2022 19:21:56 +0000 Message-ID: Subject: Re: [PATCH] UefiPayloadPkg: Make Boot Manager Key configurable To: "Ni, Ray" Cc: "devel@edk2.groups.io" , "Dong, Guo" , "Ma, Maurice" , "You, Benjamin" Content-Type: multipart/alternative; boundary="000000000000c6921405d8a04354" --000000000000c6921405d8a04354 Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable True - but the experience is better with F2 (on "normal" computers/non-Chromebooks). We've got a lot of feedback, and for most, people turn on their computers and start tapping Escape when they want Grub. If it's mapped, this gets intercepted by UiApp. Even if they exit, with BGRT in the equation, it requires fairly precise timing to access Grub. On Tue, 22 Feb 2022 at 04:59, Ni, Ray wrote: > Grub runs later. Then what does =E2=80=9Cconflict=E2=80=9D mean? > > > > *From:* Sean Rhodes > *Sent:* Monday, February 21, 2022 3:48 PM > *To:* Ni, Ray > *Cc:* devel@edk2.groups.io; Dong, Guo ; Ma, Maurice < > maurice.ma@intel.com>; You, Benjamin > *Subject:* Re: [PATCH] UefiPayloadPkg: Make Boot Manager Key configurable > > > > We would prefer to keep PCD, as Esc can conflict with Grub on normal (not > Chromebook) devices > > > > Thank you > > > > On Mon, 21 Feb 2022 at 05:26, Ni, Ray wrote: > > Can you just map both ESC and F2 to the UI? So that PCD is not needed. > > Thanks, > Ray > > -----Original Message----- > From: Sean Rhodes > Sent: Monday, February 21, 2022 5:39 AM > To: devel@edk2.groups.io > Cc: Dong, Guo ; Rhodes, Sean ; > Ni, Ray ; Ma, Maurice ; You, > Benjamin > Subject: [PATCH] UefiPayloadPkg: Make Boot Manager Key configurable > > Provide a build option to use [Esc] instead of [F2] for devices > such as Chromebooks that don't have F-keys. > > Cc: Guo Dong > Cc: Ray Ni > Cc: Maurice Ma > Cc: Benjamin You > Signed-off-by: Sean Rhodes > --- > .../Library/BrotliCustomDecompressLib/brotli | 2 +- > .../PlatformBootManager.c | 44 +++++++++++++------ > .../PlatformBootManagerLib.inf | 1 + > UefiPayloadPkg/UefiPayloadPkg.dec | 3 ++ > UefiPayloadPkg/UefiPayloadPkg.dsc | 3 ++ > 5 files changed, 39 insertions(+), 14 deletions(-) > > diff --git a/MdeModulePkg/Library/BrotliCustomDecompressLib/brotli > b/MdeModulePkg/Library/BrotliCustomDecompressLib/brotli > index f4153a09f8..666c3280cc 160000 > --- a/MdeModulePkg/Library/BrotliCustomDecompressLib/brotli > +++ b/MdeModulePkg/Library/BrotliCustomDecompressLib/brotli > @@ -1 +1 @@ > -Subproject commit f4153a09f87cbb9c826d8fc12c74642bb2d879ea > +Subproject commit 666c3280cc11dc433c303d79a83d4ffbdd12cc8d > diff --git > a/UefiPayloadPkg/Library/PlatformBootManagerLib/PlatformBootManager.c > b/UefiPayloadPkg/Library/PlatformBootManagerLib/PlatformBootManager.c > index a8ead775ea..0eb577313a 100644 > --- a/UefiPayloadPkg/Library/PlatformBootManagerLib/PlatformBootManager.c > +++ b/UefiPayloadPkg/Library/PlatformBootManagerLib/PlatformBootManager.c > @@ -164,7 +164,7 @@ PlatformBootManagerBeforeConsole ( > ) > > { > > EFI_INPUT_KEY Enter; > > - EFI_INPUT_KEY F2; > > + EFI_INPUT_KEY CustomKey; > > EFI_INPUT_KEY Down; > > EFI_BOOT_MANAGER_LOAD_OPTION BootOption; > > EFI_STATUS Status; > > @@ -186,13 +186,22 @@ PlatformBootManagerBeforeConsole ( > Enter.UnicodeChar =3D CHAR_CARRIAGE_RETURN; > > EfiBootManagerRegisterContinueKeyOption (0, &Enter, NULL); > > > > - // > > - // Map F2 to Boot Manager Menu > > - // > > - F2.ScanCode =3D SCAN_F2; > > - F2.UnicodeChar =3D CHAR_NULL; > > + if (FixedPcdGetBool (PcdBootManagerEscape)) { > > + // > > + // Map Esc to Boot Manager Menu > > + // > > + CustomKey.ScanCode =3D SCAN_ESC; > > + CustomKey.UnicodeChar =3D CHAR_NULL; > > + } else { > > + // > > + // Map Esc to Boot Manager Menu > > + // > > + CustomKey.ScanCode =3D SCAN_F2; > > + CustomKey.UnicodeChar =3D CHAR_NULL; > > + } > > + > > EfiBootManagerGetBootManagerMenu (&BootOption); > > - EfiBootManagerAddKeyOptionVariable (NULL, > (UINT16)BootOption.OptionNumber, 0, &F2, NULL); > > + EfiBootManagerAddKeyOptionVariable (NULL, > (UINT16)BootOption.OptionNumber, 0, &CustomKey, NULL); > > > > // > > // Also add Down key to Boot Manager Menu since some serial terminals > don't support F2 key. > > @@ -251,12 +260,21 @@ PlatformBootManagerAfterConsole ( > // > > PlatformRegisterFvBootOption (PcdGetPtr (PcdShellFile), L"UEFI Shell", > LOAD_OPTION_ACTIVE); > > > > - Print ( > > - L"\n" > > - L"F2 or Down to enter Boot Manager Menu.\n" > > - L"ENTER to boot directly.\n" > > - L"\n" > > - ); > > + if (FixedPcdGetBool (PcdBootManagerEscape)) { > > + Print ( > > + L"\n" > > + L"Esc or Down to enter Boot Manager Menu.\n" > > + L"ENTER to boot directly.\n" > > + L"\n" > > + ); > > + } else { > > + Print ( > > + L"\n" > > + L"F2 or Down to enter Boot Manager Menu.\n" > > + L"ENTER to boot directly.\n" > > + L"\n" > > + ); > > + } > > } > > > > /** > > diff --git > a/UefiPayloadPkg/Library/PlatformBootManagerLib/PlatformBootManagerLib.in= f > b/UefiPayloadPkg/Library/PlatformBootManagerLib/PlatformBootManagerLib.in= f > index 9c4a9da943..80390e0d98 100644 > --- > a/UefiPayloadPkg/Library/PlatformBootManagerLib/PlatformBootManagerLib.in= f > +++ > b/UefiPayloadPkg/Library/PlatformBootManagerLib/PlatformBootManagerLib.in= f > @@ -73,3 +73,4 @@ > gEfiMdePkgTokenSpaceGuid.PcdUartDefaultParity > > gEfiMdePkgTokenSpaceGuid.PcdUartDefaultStopBits > > gEfiMdeModulePkgTokenSpaceGuid.PcdBootManagerMenuFile > > + gUefiPayloadPkgTokenSpaceGuid.PcdBootManagerEscape > > diff --git a/UefiPayloadPkg/UefiPayloadPkg.dec > b/UefiPayloadPkg/UefiPayloadPkg.dec > index 551f0a4915..f2fcdf6a74 100644 > --- a/UefiPayloadPkg/UefiPayloadPkg.dec > +++ b/UefiPayloadPkg/UefiPayloadPkg.dec > @@ -83,6 +83,9 @@ > gUefiPayloadPkgTokenSpaceGuid.PcdSystemMemoryUefiRegionSize|0x04000000|UI= NT32|0x > > > gUefiPayloadPkgTokenSpaceGuid.PcdPcdDriverFile|{ 0x57, 0x72, 0xcf, 0x80, > 0xab, 0x87, 0xf9, 0x47, 0xa3, 0xfe, 0xD5, 0x0B, 0x76, 0xd8, 0x95, 0x41 > }|VOID*|0x00000018 > > > > +# Boot Manager Key > > > +gUefiPayloadPkgTokenSpaceGuid.PcdBootManagerEscape|FALSE|BOOLEAN|0x00000= 020 > > + > > ## FFS filename to find the default variable initial data file. > > # @Prompt FFS Name of variable initial data file > > gUefiPayloadPkgTokenSpaceGuid.PcdNvsDataFile |{ 0x1a, 0xf1, 0xb1, 0xae, > 0x42, 0xcc, 0xcf, 0x4e, 0xac, 0x60, 0xdb, 0xab, 0xf6, 0xca, 0x69, 0xe6 > }|VOID*|0x00000025 > > diff --git a/UefiPayloadPkg/UefiPayloadPkg.dsc > b/UefiPayloadPkg/UefiPayloadPkg.dsc > index 1ce96a51c1..ee9680a2b7 100644 > --- a/UefiPayloadPkg/UefiPayloadPkg.dsc > +++ b/UefiPayloadPkg/UefiPayloadPkg.dsc > @@ -33,6 +33,7 @@ > DEFINE UNIVERSAL_PAYLOAD =3D FALSE > > DEFINE SECURITY_STUB_ENABLE =3D TRUE > > DEFINE SMM_SUPPORT =3D FALSE > > + DEFINE BOOT_MANAGER_ESCAPE =3D FALSE > > # > > # SBL: UEFI payload for Slim Bootloader > > # COREBOOT: UEFI payload for coreboot > > @@ -399,6 +400,8 @@ > gEfiMdePkgTokenSpaceGuid.PcdPerformanceLibraryPropertyMask | 0x1 > > !endif > > > > + > gUefiPayloadPkgTokenSpaceGuid.PcdBootManagerEscape|$(BOOT_MANAGER_ESCAPE) > > + > > [PcdsPatchableInModule.X64] > > gPcAtChipsetPkgTokenSpaceGuid.PcdRtcIndexRegister|$(RTC_INDEX_REGISTER= ) > > > gPcAtChipsetPkgTokenSpaceGuid.PcdRtcTargetRegister|$(RTC_TARGET_REGISTER= ) > > -- > 2.32.0 > > --000000000000c6921405d8a04354 Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable
True - but the experience is better with F2 (on "norm= al"=C2=A0computers/non-Chromebooks).

We've got a lo= t of feedback, and for most, people=C2=A0turn on their computers and start = tapping Escape when they want Grub. If it's mapped, this gets intercept= ed by UiApp. Even if they exit, with BGRT in the equation, it requires fair= ly precise timing to access Grub.

On Tue, 22 Feb 2022 at 04:59, Ni, Ra= y <ray.ni@intel.com> wrote:

Grub runs later. Then what does =E2=80=9Cconflict=E2= =80=9D mean?

=C2=A0

From: Sean Rhodes <sean@starlabs.systems&g= t;
Sent: Monday, February 21, 2022 3:48 PM
To: Ni, Ray <ray.ni@intel.com>
Cc: devel@= edk2.groups.io; Dong, Guo <guo.dong@intel.com>; Ma, Maurice <maurice.ma@intel.com>; You= , Benjamin <= benjamin.you@intel.com>
Subject: Re: [PATCH] UefiPayloadPkg: Make Boot Manager Key configura= ble

=C2=A0

We would prefer to keep PCD, as Esc can conflict with Grub on n= ormal (not Chromebook) devices

=C2=A0

Thank you

=C2=A0

On Mon, 21 Feb 2022 at 05:26, Ni, Ray <ray.ni@intel.com> wrote:=

Can you just map both E= SC and F2 to the UI? So that PCD is not needed.

Thanks,
Ray

-----Original Message-----
From: Sean Rhodes <sean@starlabs.systems>
Sent: Monday, February 21, 2022 5:39 AM
To: devel@edk2.gr= oups.io
Cc: Dong, Guo <g= uo.dong@intel.com>; Rhodes, Sean <sean@starlabs.systems>; Ni, Ray <ray.ni@intel.com>;= Ma, Maurice <maur= ice.ma@intel.com>; You, Benjamin <benjamin.you@intel.com>
Subject: [PATCH] UefiPayloadPkg: Make Boot Manager Key configurable

Provide a build option to use [Esc] instead of [F2] for devices
such as Chromebooks that don't have F-keys.

Cc: Guo Dong <gu= o.dong@intel.com>
Cc: Ray Ni <ray.ni= @intel.com>
Cc: Maurice Ma <maurice.ma@intel.com>
Cc: Benjamin You <benjamin.you@intel.com>
Signed-off-by: Sean Rhodes <sean@starlabs.systems>
---
=C2=A0.../Library/BrotliCustomDecompressLib/brotli=C2=A0 |=C2=A0 2 +-
=C2=A0.../PlatformBootManager.c=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 = =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0| 44 +++++++++++++------
=C2=A0.../PlatformBootManagerLib.inf=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 =C2=A0 |=C2=A0 1 +
=C2=A0UefiPayloadPkg/UefiPayloadPkg.dec=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 = =C2=A0 =C2=A0|=C2=A0 3 ++
=C2=A0UefiPayloadPkg/UefiPayloadPkg.dsc=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 = =C2=A0 =C2=A0|=C2=A0 3 ++
=C2=A05 files changed, 39 insertions(+), 14 deletions(-)

diff --git a/MdeModulePkg/Library/BrotliCustomDecompressLib/brotli b/MdeMod= ulePkg/Library/BrotliCustomDecompressLib/brotli
index f4153a09f8..666c3280cc 160000
--- a/MdeModulePkg/Library/BrotliCustomDecompressLib/brotli
+++ b/MdeModulePkg/Library/BrotliCustomDecompressLib/brotli
@@ -1 +1 @@
-Subproject commit f4153a09f87cbb9c826d8fc12c74642bb2d879ea
+Subproject commit 666c3280cc11dc433c303d79a83d4ffbdd12cc8d
diff --git a/UefiPayloadPkg/Library/PlatformBootManagerLib/PlatformBootMana= ger.c b/UefiPayloadPkg/Library/PlatformBootManagerLib/PlatformBootManager.c=
index a8ead775ea..0eb577313a 100644
--- a/UefiPayloadPkg/Library/PlatformBootManagerLib/PlatformBootManager.c +++ b/UefiPayloadPkg/Library/PlatformBootManagerLib/PlatformBootManager.c @@ -164,7 +164,7 @@ PlatformBootManagerBeforeConsole (
=C2=A0 =C2=A0)

=C2=A0{

=C2=A0 =C2=A0EFI_INPUT_KEY=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 = =C2=A0 =C2=A0Enter;

-=C2=A0 EFI_INPUT_KEY=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0F2;

+=C2=A0 EFI_INPUT_KEY=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0CustomKey;

=C2=A0 =C2=A0EFI_INPUT_KEY=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 = =C2=A0 =C2=A0Down;

=C2=A0 =C2=A0EFI_BOOT_MANAGER_LOAD_OPTION=C2=A0 BootOption;

=C2=A0 =C2=A0EFI_STATUS=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 =C2=A0 Status;

@@ -186,13 +186,22 @@ PlatformBootManagerBeforeConsole (
=C2=A0 =C2=A0Enter.UnicodeChar =3D CHAR_CARRIAGE_RETURN;

=C2=A0 =C2=A0EfiBootManagerRegisterContinueKeyOption (0, &Enter, NULL);=



-=C2=A0 //

-=C2=A0 // Map F2 to Boot Manager Menu

-=C2=A0 //

-=C2=A0 F2.ScanCode=C2=A0 =C2=A0 =3D SCAN_F2;

-=C2=A0 F2.UnicodeChar =3D CHAR_NULL;

+=C2=A0 if (FixedPcdGetBool (PcdBootManagerEscape)) {

+=C2=A0 =C2=A0 //

+=C2=A0 =C2=A0 // Map Esc to Boot Manager Menu

+=C2=A0 =C2=A0 //

+=C2=A0 =C2=A0 CustomKey.ScanCode=C2=A0 =C2=A0 =3D SCAN_ESC;

+=C2=A0 =C2=A0 CustomKey.UnicodeChar =3D CHAR_NULL;

+=C2=A0 } else {

+=C2=A0 =C2=A0 //

+=C2=A0 =C2=A0 // Map Esc to Boot Manager Menu

+=C2=A0 =C2=A0 //

+=C2=A0 =C2=A0 CustomKey.ScanCode=C2=A0 =C2=A0 =3D SCAN_F2;

+=C2=A0 =C2=A0 CustomKey.UnicodeChar =3D CHAR_NULL;

+=C2=A0 }

+

=C2=A0 =C2=A0EfiBootManagerGetBootManagerMenu (&BootOption);

-=C2=A0 EfiBootManagerAddKeyOptionVariable (NULL, (UINT16)BootOption.Option= Number, 0, &F2, NULL);

+=C2=A0 EfiBootManagerAddKeyOptionVariable (NULL, (UINT16)BootOption.Option= Number, 0, &CustomKey, NULL);



=C2=A0 =C2=A0//

=C2=A0 =C2=A0// Also add Down key to Boot Manager Menu since some serial te= rminals don't support F2 key.

@@ -251,12 +260,21 @@ PlatformBootManagerAfterConsole (
=C2=A0 =C2=A0//

=C2=A0 =C2=A0PlatformRegisterFvBootOption (PcdGetPtr (PcdShellFile), L"= ;UEFI Shell", LOAD_OPTION_ACTIVE);



-=C2=A0 Print (

-=C2=A0 =C2=A0 L"\n"

-=C2=A0 =C2=A0 L"F2 or Down=C2=A0 =C2=A0 =C2=A0 to enter Boot Manager = Menu.\n"

-=C2=A0 =C2=A0 L"ENTER=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0to boot= directly.\n"

-=C2=A0 =C2=A0 L"\n"

-=C2=A0 =C2=A0 );

+=C2=A0 if (FixedPcdGetBool (PcdBootManagerEscape)) {

+=C2=A0 =C2=A0 Print (

+=C2=A0 =C2=A0 =C2=A0 L"\n"

+=C2=A0 =C2=A0 =C2=A0 L"Esc or Down=C2=A0 =C2=A0 =C2=A0 to enter Boot = Manager Menu.\n"

+=C2=A0 =C2=A0 =C2=A0 L"ENTER=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0= to boot directly.\n"

+=C2=A0 =C2=A0 =C2=A0 L"\n"

+=C2=A0 =C2=A0 =C2=A0 );

+=C2=A0 } else {

+=C2=A0 =C2=A0 Print (

+=C2=A0 =C2=A0 =C2=A0 L"\n"

+=C2=A0 =C2=A0 =C2=A0 L"F2 or Down=C2=A0 =C2=A0 =C2=A0 to enter Boot M= anager Menu.\n"

+=C2=A0 =C2=A0 =C2=A0 L"ENTER=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0= to boot directly.\n"

+=C2=A0 =C2=A0 =C2=A0 L"\n"

+=C2=A0 =C2=A0 =C2=A0 );

+=C2=A0 }

=C2=A0}



=C2=A0/**

diff --git a/UefiPayloadPkg/Library/PlatformBootManagerLib/PlatformBootMana= gerLib.inf b/UefiPayloadPkg/Library/PlatformBootManagerLib/PlatformBootMana= gerLib.inf
index 9c4a9da943..80390e0d98 100644
--- a/UefiPayloadPkg/Library/PlatformBootManagerLib/PlatformBootManagerLib.= inf
+++ b/UefiPayloadPkg/Library/PlatformBootManagerLib/PlatformBootManagerLib.= inf
@@ -73,3 +73,4 @@
=C2=A0 =C2=A0gEfiMdePkgTokenSpaceGuid.PcdUartDefaultParity

=C2=A0 =C2=A0gEfiMdePkgTokenSpaceGuid.PcdUartDefaultStopBits

=C2=A0 =C2=A0gEfiMdeModulePkgTokenSpaceGuid.PcdBootManagerMenuFile

+=C2=A0 gUefiPayloadPkgTokenSpaceGuid.PcdBootManagerEscape

diff --git a/UefiPayloadPkg/UefiPayloadPkg.dec b/UefiPayloadPkg/UefiPayload= Pkg.dec
index 551f0a4915..f2fcdf6a74 100644
--- a/UefiPayloadPkg/UefiPayloadPkg.dec
+++ b/UefiPayloadPkg/UefiPayloadPkg.dec
@@ -83,6 +83,9 @@ gUefiPayloadPkgTokenSpaceGuid.PcdSystemMemoryUefiRegionSi= ze|0x04000000|UINT32|0x


=C2=A0gUefiPayloadPkgTokenSpaceGuid.PcdPcdDriverFile|{ 0x57, 0x72, 0xcf, 0x= 80, 0xab, 0x87, 0xf9, 0x47, 0xa3, 0xfe, 0xD5, 0x0B, 0x76, 0xd8, 0x95, 0x41 = }|VOID*|0x00000018



+# Boot Manager Key

+gUefiPayloadPkgTokenSpaceGuid.PcdBootManagerEscape|FALSE|BOOLEAN|0x0000002= 0

+

=C2=A0## FFS filename to find the default variable initial data file.

=C2=A0# @Prompt FFS Name of variable initial data file

=C2=A0 gUefiPayloadPkgTokenSpaceGuid.PcdNvsDataFile |{ 0x1a, 0xf1, 0xb1, 0x= ae, 0x42, 0xcc, 0xcf, 0x4e, 0xac, 0x60, 0xdb, 0xab, 0xf6, 0xca, 0x69, 0xe6 = }|VOID*|0x00000025

diff --git a/UefiPayloadPkg/UefiPayloadPkg.dsc b/UefiPayloadPkg/UefiPayload= Pkg.dsc
index 1ce96a51c1..ee9680a2b7 100644
--- a/UefiPayloadPkg/UefiPayloadPkg.dsc
+++ b/UefiPayloadPkg/UefiPayloadPkg.dsc
@@ -33,6 +33,7 @@
=C2=A0 =C2=A0DEFINE UNIVERSAL_PAYLOAD=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =3D FALSE

=C2=A0 =C2=A0DEFINE SECURITY_STUB_ENABLE=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0= =3D TRUE

=C2=A0 =C2=A0DEFINE SMM_SUPPORT=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 = =C2=A0 =C2=A0 =C2=A0 =3D FALSE

+=C2=A0 DEFINE BOOT_MANAGER_ESCAPE=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =3D FA= LSE

=C2=A0 =C2=A0#

=C2=A0 =C2=A0# SBL:=C2=A0 =C2=A0 =C2=A0 UEFI payload for Slim Bootloader
=C2=A0 =C2=A0# COREBOOT: UEFI payload for coreboot

@@ -399,6 +400,8 @@
=C2=A0 =C2=A0gEfiMdePkgTokenSpaceGuid.PcdPerformanceLibraryPropertyMask=C2= =A0 =C2=A0 =C2=A0 =C2=A0| 0x1

=C2=A0!endif



+=C2=A0 gUefiPayloadPkgTokenSpaceGuid.PcdBootManagerEscape|$(BOOT_MANAGER_E= SCAPE)

+

=C2=A0[PcdsPatchableInModule.X64]

=C2=A0 =C2=A0gPcAtChipsetPkgTokenSpaceGuid.PcdRtcIndexRegister|$(RTC_INDEX_= REGISTER)

=C2=A0 =C2=A0gPcAtChipsetPkgTokenSpaceGuid.PcdRtcTargetRegister|$(RTC_TARGE= T_REGISTER)

--
2.32.0

--000000000000c6921405d8a04354--