UefiPayloadPkg: remove the change that get platform specific logic

REF: https://bugzilla.tianocore.org/show_bug.cgi?id=4241

Since UefiPayloadPkg had supported multiple firmware volume,
remove the platform specific logic via protocol

Cc: Ray Ni <ray.ni@intel.com>
Cc: Sean Rhodes <sean@starlabs.systems>
Cc: Gua Guo <gua.guo@intel.com>
Reviewed-by: James Lu <james.lu@intel.com>
Reviewed-by: Guo Dong <guo.dong@intel.com>

Signed-off-by: MarsX Lin <marsx.lin@intel.com>

2 files changed, 0 insertions, 28 deletions

diff --git a/UefiPayloadPkg/Library/PlatformBootManagerLib/PlatformBootManager.c b/UefiPayloadPkg/Library/PlatformBootManagerLib/PlatformBootManager.c
index a92a260a6e..62637ae6aa 100644
--- a/UefiPayloadPkg/Library/PlatformBootManagerLib/PlatformBootManager.c
+++ b/UefiPayloadPkg/Library/PlatformBootManagerLib/PlatformBootManager.c
@@ -9,12 +9,9 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
 

 #include "PlatformBootManager.h"

 #include "PlatformConsole.h"

-#include <Protocol/PlatformBootManagerOverride.h>

 #include <Guid/BootManagerMenu.h>

 #include <Library/HobLib.h>

 

-UNIVERSAL_PAYLOAD_PLATFORM_BOOT_MANAGER_OVERRIDE_PROTOCOL  *mUniversalPayloadPlatformBootManagerOverrideInstance = NULL;

-

 /**

   Signal EndOfDxe event and install SMM Ready to lock protocol.

 

@@ -167,17 +164,6 @@ PlatformBootManagerBeforeConsole (
   EFI_INPUT_KEY                 CustomKey;

   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

@@ -246,11 +232,6 @@ PlatformBootManagerAfterConsole (
   EDKII_PLATFORM_LOGO_PROTOCOL   *PlatformLogo;

   EFI_STATUS                     Status;

 

-  if (mUniversalPayloadPlatformBootManagerOverrideInstance != NULL) {

-    mUniversalPayloadPlatformBootManagerOverrideInstance->AfterConsole ();

-    return;

-  }

-

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

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

 

@@ -297,10 +278,6 @@ PlatformBootManagerWaitCallback (
   UINT16  TimeoutRemain

   )

 {

-  if (mUniversalPayloadPlatformBootManagerOverrideInstance != NULL) {

-    mUniversalPayloadPlatformBootManagerOverrideInstance->WaitCallback (TimeoutRemain);

-  }

-

   return;

 }

 

@@ -317,10 +294,6 @@ PlatformBootManagerUnableToBoot (
   VOID

   )

 {

-  if (mUniversalPayloadPlatformBootManagerOverrideInstance != NULL) {

-    mUniversalPayloadPlatformBootManagerOverrideInstance->UnableToBoot ();

-  }

-

   return;

 }

 

diff --git a/UefiPayloadPkg/Library/PlatformBootManagerLib/PlatformBootManagerLib.inf b/UefiPayloadPkg/Library/PlatformBootManagerLib/PlatformBootManagerLib.inf
index 7ec93420f2..f9626175e2 100644
--- a/UefiPayloadPkg/Library/PlatformBootManagerLib/PlatformBootManagerLib.inf
+++ b/UefiPayloadPkg/Library/PlatformBootManagerLib/PlatformBootManagerLib.inf
@@ -60,7 +60,6 @@
   gEfiBootLogoProtocolGuid        ## CONSUMES

   gEfiDxeSmmReadyToLockProtocolGuid

   gEfiSmmAccess2ProtocolGuid

-  gUniversalPayloadPlatformBootManagerOverrideProtocolGuid

   gEfiSerialIoProtocolGuid

   gEfiPciRootBridgeIoProtocolGuid