diff options
| author | MarsX Lin <marsx.lin@intel.com> | 2023-01-03 14:55:20 +0800 |
|---|---|---|
| committer | mergify[bot] <37929162+mergify[bot]@users.noreply.github.com> | 2023-02-23 07:47:12 +0000 |
| commit | 1eeca0750af5af2f0e78437bf791ac2de74bde74 (patch) | |
| tree | 676a320ba00cd17e2be3c89a7738068f4cb5076e /UefiPayloadPkg/Library | |
| parent | bc82574de476fbb485dee36650ab22865892d0d4 (diff) | |
| download | edk2-1eeca0750af5af2f0e78437bf791ac2de74bde74.tar.gz edk2-1eeca0750af5af2f0e78437bf791ac2de74bde74.tar.bz2 edk2-1eeca0750af5af2f0e78437bf791ac2de74bde74.zip | |
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>
Diffstat (limited to 'UefiPayloadPkg/Library')
| -rw-r--r-- | UefiPayloadPkg/Library/PlatformBootManagerLib/PlatformBootManager.c | 27 | ||||
| -rw-r--r-- | UefiPayloadPkg/Library/PlatformBootManagerLib/PlatformBootManagerLib.inf | 1 |
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
|