OvmfPkg: swap Esc and F2 mapping

We want the following: - ESC - one time boot menu - F2 - setup menu See the discussion in Github: #91 (comment) Signed-off-by: Maciej Pijanowski <[email protected]>
Dasharo · Oct 11, 2023 · d0c09a9 · d0c09a9
1 parent 9226172
commit d0c09a9
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/OvmfPkg/Library/PlatformBootManagerLib/BdsPlatform.c b/OvmfPkg/Library/PlatformBootManagerLib/BdsPlatform.c
@@ -445,11 +445,11 @@ PlatformRegisterOptionsAndKeys (
   ASSERT_EFI_ERROR (Status);
   OptionNumber = GetBootManagerMenuAppOption ();
   Status = EfiBootManagerAddKeyOptionVariable (
-             NULL, (UINT16) OptionNumber, 0, &F2, NULL
+             NULL, (UINT16) OptionNumber, 0, &Esc, NULL
              );
   ASSERT (Status == EFI_SUCCESS || Status == EFI_ALREADY_STARTED);
   Status = EfiBootManagerAddKeyOptionVariable (
-             NULL, (UINT16) BootOption.OptionNumber, 0, &Esc, NULL
+             NULL, (UINT16) BootOption.OptionNumber, 0, &F2, NULL
              );
   ASSERT (Status == EFI_SUCCESS || Status == EFI_ALREADY_STARTED);
 }
@@ -1630,8 +1630,8 @@ PlatformBootManagerAfterConsole (
 
   // This is probably the earliest we can print this, as before the console is
   // not ready yet.
-  Print(L"ESC to enter Setup\n");
-  Print(L"F2 to enter Boot Manager Menu\n");
+  Print(L"F2 to enter Setup\n");
+  Print(L"Esc to enter Boot Manager Menu\n");
   Print(L"ENTER to boot directly\n");
 
   if (PcdGetBool (PcdOvmfFlashVariablesEnable)) {