UefiPayloadPkg: Get platform specific logic via protocol for BDS

Currently, BDS driver will link a PlatformBootManagerLib, which contains
platform specific logic. This patch get the platform specific logic from
a protocol, so that platform logic for Boot manager can be in another
binary.

Cc: Maurice Ma <maurice.ma@intel.com>
Cc: Guo Dong <guo.dong@intel.com>
Cc: Benjamin You <benjamin.you@intel.com>

Reviewed-by: Guo Dong <guo.dong@intel.com>
Signed-off-by: Zhiguang Liu <zhiguang.liu@intel.com>

2 files changed, 26 insertions, 2 deletions

diff --git a/UefiPayloadPkg/Library/PlatformBootManagerLib/PlatformBootManager.c b/UefiPayloadPkg/Library/PlatformBootManagerLib/PlatformBootManager.c
index 7fa3a048b7..fce48d26a1 100644
--- a/UefiPayloadPkg/Library/PlatformBootManagerLib/PlatformBootManager.c
+++ b/UefiPayloadPkg/Library/PlatformBootManagerLib/PlatformBootManager.c
@@ -2,13 +2,16 @@
   This file include all platform action which can be customized

   by IBV/OEM.

 

-Copyright (c) 2015 - 2018, Intel Corporation. All rights reserved.<BR>

+Copyright (c) 2015 - 2021, Intel Corporation. All rights reserved.<BR>

 SPDX-License-Identifier: BSD-2-Clause-Patent

 

 **/

 

 #include "PlatformBootManager.h"

 #include "PlatformConsole.h"

+#include <Protocol/PlatformBootManagerOverride.h>

+

+UNIVERSAL_PAYLOAD_PLATFORM_BOOT_MANAGER_OVERRIDE_PROTOCOL  *mUniversalPayloadPlatformBootManagerOverrideInstance = NULL;

 

 VOID

 InstallReadyToLock (

@@ -156,6 +159,16 @@ PlatformBootManagerBeforeConsole (
   EFI_INPUT_KEY                F2;

   EFI_INPUT_KEY                Down;

   EFI_BOOT_MANAGER_LOAD_OPTION BootOption;

+  EFI_STATUS                   Status;

+

+  Status = gBS->LocateProtocol (&gUniversalPayloadPlatformBootManagerOverrideProtocolGuid, NULL, (VOID **) &mUniversalPayloadPlatformBootManagerOverrideInstance);

+  if (EFI_ERROR (Status)) {

+    mUniversalPayloadPlatformBootManagerOverrideInstance = NULL;

+  }

+  if (mUniversalPayloadPlatformBootManagerOverrideInstance != NULL){

+    mUniversalPayloadPlatformBootManagerOverrideInstance->BeforeConsole();

+    return;

+  }

 

   //

   // Register ENTER as CONTINUE key

@@ -213,6 +226,10 @@ PlatformBootManagerAfterConsole (
   EFI_GRAPHICS_OUTPUT_BLT_PIXEL  Black;

   EFI_GRAPHICS_OUTPUT_BLT_PIXEL  White;

 

+  if (mUniversalPayloadPlatformBootManagerOverrideInstance != NULL){

+    mUniversalPayloadPlatformBootManagerOverrideInstance->AfterConsole();

+    return;

+  }

   Black.Blue = Black.Green = Black.Red = Black.Reserved = 0;

   White.Blue = White.Green = White.Red = White.Reserved = 0xFF;

 

@@ -244,6 +261,9 @@ PlatformBootManagerWaitCallback (
   UINT16          TimeoutRemain

 )

 {

+  if (mUniversalPayloadPlatformBootManagerOverrideInstance != NULL){

+    mUniversalPayloadPlatformBootManagerOverrideInstance->WaitCallback (TimeoutRemain);

+  }

   return;

 }

 

@@ -260,6 +280,9 @@ PlatformBootManagerUnableToBoot (
   VOID

   )

 {

+  if (mUniversalPayloadPlatformBootManagerOverrideInstance != NULL){

+    mUniversalPayloadPlatformBootManagerOverrideInstance->UnableToBoot();

+  }

   return;

 }

 

diff --git a/UefiPayloadPkg/Library/PlatformBootManagerLib/PlatformBootManagerLib.inf b/UefiPayloadPkg/Library/PlatformBootManagerLib/PlatformBootManagerLib.inf
index 1f5a0bcad0..600a535282 100644
--- a/UefiPayloadPkg/Library/PlatformBootManagerLib/PlatformBootManagerLib.inf
+++ b/UefiPayloadPkg/Library/PlatformBootManagerLib/PlatformBootManagerLib.inf
@@ -1,7 +1,7 @@
 ## @file

 #  Include all platform action which can be customized by IBV/OEM.

 #

-#  Copyright (c) 2012 - 2016, Intel Corporation. All rights reserved.<BR>

+#  Copyright (c) 2012 - 2021, Intel Corporation. All rights reserved.<BR>

 #  SPDX-License-Identifier: BSD-2-Clause-Patent

 #

 ##

@@ -57,6 +57,7 @@
   gEfiBootLogoProtocolGuid        ## CONSUMES

   gEfiDxeSmmReadyToLockProtocolGuid

   gEfiSmmAccess2ProtocolGuid

+  gUniversalPayloadPlatformBootManagerOverrideProtocolGuid

 

 [Pcd]

   gEfiMdePkgTokenSpaceGuid.PcdPlatformBootTimeOut