Change in edk2[coreboot-stable202108]: UefiPayloadPkg: Map ESC to Boot Manager

[Patrick Georgi (Code Review)]

Patrick Georgi has submitted this change. ( https://review.coreboot.org/c/edk2/+/58780 )

Change subject: UefiPayloadPkg: Map ESC to Boot Manager
......................................................................

UefiPayloadPkg: Map ESC to Boot Manager

Change menu key from F2 to ESC. Remove use of Enter key
to boot directly. Remove prompt text from console output.

Signed-off-by: Matt DeVillier 
Change-Id: I401144d619434faa37bc2fe2e6eeec22cbb32c2b
Reviewed-on: https://review.coreboot.org/c/edk2/+/58780
Tested-by: build bot (Jenkins) 
Reviewed-by: Tim Crawford 
Reviewed-by: Patrick Georgi 
---
M UefiPayloadPkg/Library/PlatformBootManagerLib/PlatformBootManager.c
1 file changed, 5 insertions(+), 30 deletions(-)

Approvals:
  build bot (Jenkins): Verified
  Patrick Georgi: Looks good to me, approved
  Tim Crawford: Looks good to me, but someone else must approve

diff --git a/UefiPayloadPkg/Library/PlatformBootManagerLib/PlatformBootManager.c b/UefiPayloadPkg/Library/PlatformBootManagerLib/PlatformBootManager.c
index c4d317f..20be2d7 100644
--- a/UefiPayloadPkg/Library/PlatformBootManagerLib/PlatformBootManager.c
+++ b/UefiPayloadPkg/Library/PlatformBootManagerLib/PlatformBootManager.c
@@ -157,9 +157,7 @@
   VOID
 )
 {
-  EFI_INPUT_KEY                Enter;
-  EFI_INPUT_KEY                F2;
-  EFI_INPUT_KEY                Down;
+  EFI_INPUT_KEY                Escape;
   EFI_BOOT_MANAGER_LOAD_OPTION BootOption;
   EFI_STATUS                   Status;

@@ -173,27 +171,12 @@
   }

//
-  // Register ENTER as CONTINUE key
+  // Map Escape to Boot Manager Menu
   //
-  Enter.ScanCode    = SCAN_NULL;
-  Enter.UnicodeChar = CHAR_CARRIAGE_RETURN;
-  EfiBootManagerRegisterContinueKeyOption (0, &Enter, NULL);
-
-  //
-  // Map F2 to Boot Manager Menu
-  //
-  F2.ScanCode    = SCAN_F2;
-  F2.UnicodeChar = CHAR_NULL;
+  Escape.ScanCode    = SCAN_ESC;
+  Escape.UnicodeChar = CHAR_NULL;
   EfiBootManagerGetBootManagerMenu (&BootOption);
-  EfiBootManagerAddKeyOptionVariable (NULL, (UINT16) BootOption.OptionNumber, 0, &F2, NULL);
-
-  //
-  // Also add Down key to Boot Manager Menu since some serial terminals don't support F2 key.
-  //
-  Down.ScanCode    = SCAN_DOWN;
-  Down.UnicodeChar = CHAR_NULL;
-  EfiBootManagerGetBootManagerMenu (&BootOption);
-  EfiBootManagerAddKeyOptionVariable (NULL, (UINT16) BootOption.OptionNumber, 0, &Down, NULL);
+  EfiBootManagerAddKeyOptionVariable (NULL, (UINT16) BootOption.OptionNumber, 0, &Escape, NULL);

//
   // Install ready to lock.
@@ -242,14 +225,6 @@
   // Register UEFI Shell
   //
   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"
-  );
-
 }

/**