From: gdong1 <guo.dong@intel.com>
Date: Thu, 27 Oct 2016 00:49:58 +0000 (-0700)
Subject: CorebootPayloadPkg: Make EFI shell the last boot option.
X-Git-Tag: edk2-stable201903~5429
X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=f94623aacc35bd1dd32a5d4ecb6b00121adf3847;hp=5a5025e485b299c76ebed79fa63ba88a5b219a12;p=mirror_edk2.git

CorebootPayloadPkg: Make EFI shell the last boot option.

To let it boot to OS automatically, make built in shell
as the last boot option.

Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Guo Dong <guo.dong@intel.com>
Reviewed-by: Maurice Ma <maurice.ma@intel.com>
---

diff --git a/CorebootPayloadPkg/Library/PlatformBootManagerLib/PlatformBootManager.c b/CorebootPayloadPkg/Library/PlatformBootManagerLib/PlatformBootManager.c
index a31384af00..1546e4879a 100644
--- a/CorebootPayloadPkg/Library/PlatformBootManagerLib/PlatformBootManager.c
+++ b/CorebootPayloadPkg/Library/PlatformBootManagerLib/PlatformBootManager.c
@@ -200,11 +200,6 @@ PlatformBootManagerBeforeConsole (
   EfiBootManagerGetBootManagerMenu (&BootOption);
   EfiBootManagerAddKeyOptionVariable (NULL, (UINT16) BootOption.OptionNumber, 0, &F2, NULL);
 
-  //
-  // Register UEFI Shell
-  //
-  PlatformRegisterFvBootOption (PcdGetPtr (PcdShellFile), L"UEFI Shell", LOAD_OPTION_ACTIVE);
-
   //
   // Install ready to lock.
   // This needs to be done before option rom dispatched.
@@ -237,6 +232,11 @@ PlatformBootManagerAfterConsole (
   EfiBootManagerConnectAll ();
   EfiBootManagerRefreshAllBootOption ();
 
+  //
+  // Register UEFI Shell
+  //
+  PlatformRegisterFvBootOption (PcdGetPtr (PcdShellFile), L"UEFI Shell", LOAD_OPTION_ACTIVE);
+  
   Print (
     L"\n"
     L"F2      to enter Boot Manager Menu.\n"