<div dir="auto"><div>Hi Nate,<div dir="auto">That makes sense. I had been concerned that UiApp might be used in some places, but I didn't expect significant disparity between the boards (and I didn't check all of them, my mistake).</div><div dir="auto"> </div><div dir="auto">Maybe trying to align them on some differences, someday, might be a good idea? But not for now, in any case.</div> <div class="gmail_quote"><div dir="ltr" class="gmail_attr">On Thu., Aug. 26, 2021, 7:41 p.m. Desimone, Nathaniel L, <<a href="mailto:nathaniel.l.desimone@intel.com">nathaniel.l.desimone@intel.com</a>> wrote: </div><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">Hi Benjamin, In principle this is a good idea, unfortunately some platforms have been coded to do stuff like this: <a href="https://github.com/tianocore/edk2-platforms/blob/784f7739f5afd268042d4d9e8ef570131620c82c/Platform/Intel/WhitleyOpenBoardPkg/PlatformPkg.dsc#L323" rel="noreferrer noreferrer" target="_blank">https://github.com/tianocore/edk2-platforms/blob/784f7739f5afd268042d4d9e8ef570131620c82c/Platform/Intel/WhitleyOpenBoardPkg/PlatformPkg.dsc#L323</a> And this: <a href="https://github.com/tianocore/edk2-platforms/blob/784f7739f5afd268042d4d9e8ef570131620c82c/Platform/Intel/SimicsOpenBoardPkg/BoardX58Ich10/OpenBoardPkgPcd.dsc#L210" rel="noreferrer noreferrer" target="_blank">https://github.com/tianocore/edk2-platforms/blob/784f7739f5afd268042d4d9e8ef570131620c82c/Platform/Intel/SimicsOpenBoardPkg/BoardX58Ich10/OpenBoardPkgPcd.dsc#L210</a> So the only way we can maintain a consistent user experience is to explicitly call out the GUID for the boot device selection menu. For now, I'll just push the first patch in this series. Thanks, Nate -----Original Message----- From: Benjamin Doron <<a href="mailto:benjamin.doron00@gmail.com" target="_blank" rel="noreferrer">benjamin.doron00@gmail.com</a>> Sent: Friday, August 13, 2021 5:43 PM To: <a href="mailto:devel@edk2.groups.io" target="_blank" rel="noreferrer">devel@edk2.groups.io</a> Cc: Dong, Eric <<a href="mailto:eric.dong@intel.com" target="_blank" rel="noreferrer">eric.dong@intel.com</a>>; Liming Gao <<a href="mailto:gaoliming@byosoft.com.cn" target="_blank" rel="noreferrer">gaoliming@byosoft.com.cn</a>>; Desimone, Nathaniel L <<a href="mailto:nathaniel.l.desimone@intel.com" target="_blank" rel="noreferrer">nathaniel.l.desimone@intel.com</a>> Subject: [edk2-platforms][PATCH v2 2/2] BoardModulePkg/BoardBdsHookLib: Simplify hotkey registration Retrieve BootOption of BootManagerMenu for registering F7 hotkey, rather than creating an additional boot option. Tested, both F7 hotkey still opens the list of boot options. Cc: Eric Dong <<a href="mailto:eric.dong@intel.com" target="_blank" rel="noreferrer">eric.dong@intel.com</a>> Cc: Liming Gao <<a href="mailto:gaoliming@byosoft.com.cn" target="_blank" rel="noreferrer">gaoliming@byosoft.com.cn</a>> Cc: Nate DeSimone <<a href="mailto:nathaniel.l.desimone@intel.com" target="_blank" rel="noreferrer">nathaniel.l.desimone@intel.com</a>> Signed-off-by: Benjamin Doron <<a href="mailto:benjamin.doron00@gmail.com" target="_blank" rel="noreferrer">benjamin.doron00@gmail.com</a>> --- Platform/Intel/BoardModulePkg/Library/BoardBdsHookLib/BoardBootOption.c | 19 ++++--------------- 1 file changed, 4 insertions(+), 15 deletions(-) diff --git a/Platform/Intel/BoardModulePkg/Library/BoardBdsHookLib/BoardBootOption.c b/Platform/Intel/BoardModulePkg/Library/BoardBdsHookLib/BoardBootOption.c index e734e3ad15c3..7ac6c150f2e7 100644 --- a/Platform/Intel/BoardModulePkg/Library/BoardBdsHookLib/BoardBootOption.c +++ b/Platform/Intel/BoardModulePkg/Library/BoardBdsHookLib/BoardBootOption.c @@ -14,7 +14,6 @@ BOOLEAN mPxeBoot = FALSE; BOOLEAN mHotKeypressed = FALSE; EFI_EVENT HotKeyEvent = NULL; -UINTN mBootMenuOptionNumber; UINTN mSetupOptionNumber; @@ -189,9 +188,6 @@ CreateFvBootOption ( EFI_GUID mUiFile = { 0x462CAA21, 0x7614, 0x4503, { 0x83, 0x6E, 0x8A, 0xB6, 0xF4, 0x66, 0x23, 0x31 } }; -EFI_GUID mBootMenuFile = { - 0xEEC25BDC, 0x67F2, 0x4D95, { 0xB1, 0xD5, 0xF8, 0x1B, 0x20, 0x39, 0xD1, 0x1D } -}; /** @@ -354,15 +350,6 @@ RegisterDefaultBootOption ( ShellDataSize = 0; RegisterFvBootOption (&gUefiShellFileGuid, INTERNAL_UEFI_SHELL_NAME, (UINTN) -1, LOAD_OPTION_ACTIVE, (UINT8 *)ShellData, ShellDataSize); - // - // Boot Menu - // - mBootMenuOptionNumber = RegisterFvBootOption (&mBootMenuFile, L"Boot Device List", (UINTN) -1, LOAD_OPTION_CATEGORY_APP | LOAD_OPTION_ACTIVE | LOAD_OPTION_HIDDEN, NULL, 0); - - if (mBootMenuOptionNumber == LoadOptionNumberUnassigned) { - DEBUG ((DEBUG_INFO, "BootMenuOptionNumber (%d) should not be same to LoadOptionNumberUnassigned(%d).\n", mBootMenuOptionNumber, LoadOptionNumberUnassigned)); - } - // // Boot Manager Menu // @@ -468,8 +455,10 @@ RegisterStaticHotkey ( F7.KeyState.KeyShiftState = EFI_SHIFT_STATE_VALID; F7.KeyState.KeyToggleState = 0; mBootMenuBoot = !EnterSetup; - RegisterBootOptionHotkey ((UINT16) mBootMenuOptionNumber, &F7.Key, mBootMenuBoot); - + Status = EfiBootManagerGetBootManagerMenu (&BootOption); + ASSERT_EFI_ERROR (Status); + RegisterBootOptionHotkey ((UINT16) BootOption.OptionNumber, &F7.Key, mBootMenuBoot); + EfiBootManagerFreeLoadOption (&BootOption); } -- 2.31.1 </blockquote></div></div></div> <div width="1" style="color:white;clear:both">_._,_._,_</div> <hr> Groups.io Links: You receive all messages sent to this group. <a target="_blank" href="https://edk2.groups.io/g/devel/message/79873">View/Reply Online (#79873)</a> | | <a target="_blank" href="https://groups.io/mt/84876596/1813853">Mute This Topic</a> | <a href="https://edk2.groups.io/g/devel/post">New Topic</a> <a href="https://edk2.groups.io/g/devel/editsub/1813853">Your Subscription</a> | <a href="mailto:devel+owner@edk2.groups.io">Contact Group Owner</a> | <a href="https://edk2.groups.io/g/devel/unsub">Unsubscribe</a> [edk2-devel-archive@redhat.com] <div width="1" style="color:white;clear:both">_._,_._,_</div>