tyler.durden
/
audk
mirror of https://github.com/acidanthera/audk.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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>
This commit is contained in:
MarsX Lin 2023-01-03 14:55:20 +08:00 committed by mergify[bot]
parent bc82574de4
commit 1eeca0750a
4 changed files with 0 additions and 114 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

84
UefiPayloadPkg/Include/Protocol/PlatformBootManagerOverride.h
View File

@ -1,84 +0,0 @@
/** @file
This file defines the Univeral Payload Platform BootManager Protocol.
Copyright (c) 2021, Intel Corporation. All rights reserved.<BR>
SPDX-License-Identifier: BSD-2-Clause-Patent
**/
#ifndef __PLATFORM_BOOT_MANAGER_OVERRIDE_H__
#define __PLATFORM_BOOT_MANAGER_OVERRIDE_H__
/**
Do the platform specific action before the console is connected.
Such as:
Update console variable;
Register new Driver#### or Boot####;
Signal ReadyToLock event.
This function will override the default behavior in PlatformBootManagerLib
**/
typedef
VOID
(EFIAPI *UNIVERSAL_PAYLOAD_PLATFORM_BOOT_MANAGER_OVERRIDE_BEFORE_CONSOLE)(
VOID
);
/**
Do the platform specific action after the console is connected.
Such as:
Dynamically switch output mode;
Signal console ready platform customized event;
Run diagnostics like memory testing;
Connect certain devices;
Dispatch aditional option roms.
This function will override the default behavior in PlatformBootManagerLib
**/
typedef
VOID
(EFIAPI *UNIVERSAL_PAYLOAD_PLATFORM_BOOT_MANAGER_OVERRIDE_AFTER_CONSOLE)(
VOID
);
/**
This function is called each second during the boot manager waits the timeout.
This function will override the default behavior in PlatformBootManagerLib
@param TimeoutRemain The remaining timeout.
**/
typedef
VOID
(EFIAPI *UNIVERSAL_PAYLOAD_PLATFORM_BOOT_MANAGER_OVERRIDE_WAIT_CALLBACK)(
UINT16 TimeoutRemain
);
/**
The function is called when no boot option could be launched,
including platform recovery options and options pointing to applications
built into firmware volumes.
If this function returns, BDS attempts to enter an infinite loop.
This function will override the default behavior in PlatformBootManagerLib
**/
typedef
VOID
(EFIAPI *UNIVERSAL_PAYLOAD_PLATFORM_BOOT_MANAGER_OVERRIDE_UNABLE_TO_BOOT)(
VOID
);
///
/// Provides an interface to override the default behavior in PlatformBootManagerLib,
/// so platform can provide its own platform specific logic through this protocol
///
typedef struct {
UNIVERSAL_PAYLOAD_PLATFORM_BOOT_MANAGER_OVERRIDE_BEFORE_CONSOLE BeforeConsole;
UNIVERSAL_PAYLOAD_PLATFORM_BOOT_MANAGER_OVERRIDE_AFTER_CONSOLE AfterConsole;
UNIVERSAL_PAYLOAD_PLATFORM_BOOT_MANAGER_OVERRIDE_WAIT_CALLBACK WaitCallback;
UNIVERSAL_PAYLOAD_PLATFORM_BOOT_MANAGER_OVERRIDE_UNABLE_TO_BOOT UnableToBoot;
} UNIVERSAL_PAYLOAD_PLATFORM_BOOT_MANAGER_OVERRIDE_PROTOCOL;
extern GUID gUniversalPayloadPlatformBootManagerOverrideProtocolGuid;
#endif

27
UefiPayloadPkg/Library/PlatformBootManagerLib/PlatformBootManager.c
View File

@ -9,12 +9,9 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
#include "PlatformBootManager.h" #include "PlatformBootManager.h"
#include "PlatformConsole.h" #include "PlatformConsole.h"
#include <Protocol/PlatformBootManagerOverride.h>
#include <Guid/BootManagerMenu.h> #include <Guid/BootManagerMenu.h>
#include <Library/HobLib.h> #include <Library/HobLib.h>
UNIVERSAL_PAYLOAD_PLATFORM_BOOT_MANAGER_OVERRIDE_PROTOCOL *mUniversalPayloadPlatformBootManagerOverrideInstance = NULL;
/** /**
Signal EndOfDxe event and install SMM Ready to lock protocol. Signal EndOfDxe event and install SMM Ready to lock protocol.
@ -167,17 +164,6 @@ PlatformBootManagerBeforeConsole (
EFI_INPUT_KEY CustomKey; EFI_INPUT_KEY CustomKey;
EFI_INPUT_KEY Down; EFI_INPUT_KEY Down;
EFI_BOOT_MANAGER_LOAD_OPTION BootOption; 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 // Register ENTER as CONTINUE key
@ -246,11 +232,6 @@ PlatformBootManagerAfterConsole (
EDKII_PLATFORM_LOGO_PROTOCOL *PlatformLogo; EDKII_PLATFORM_LOGO_PROTOCOL *PlatformLogo;
EFI_STATUS Status; EFI_STATUS Status;
if (mUniversalPayloadPlatformBootManagerOverrideInstance != NULL) {
mUniversalPayloadPlatformBootManagerOverrideInstance->AfterConsole ();
return;
}
Black.Blue = Black.Green = Black.Red = Black.Reserved = 0; Black.Blue = Black.Green = Black.Red = Black.Reserved = 0;
White.Blue = White.Green = White.Red = White.Reserved = 0xFF; White.Blue = White.Green = White.Red = White.Reserved = 0xFF;
@ -297,10 +278,6 @@ PlatformBootManagerWaitCallback (
UINT16 TimeoutRemain UINT16 TimeoutRemain
) )
{ {
if (mUniversalPayloadPlatformBootManagerOverrideInstance != NULL) {
mUniversalPayloadPlatformBootManagerOverrideInstance->WaitCallback (TimeoutRemain);
}
return; return;
} }
@ -317,10 +294,6 @@ PlatformBootManagerUnableToBoot (
VOID VOID
) )
{ {
if (mUniversalPayloadPlatformBootManagerOverrideInstance != NULL) {
mUniversalPayloadPlatformBootManagerOverrideInstance->UnableToBoot ();
}
return; return;
} }

1
UefiPayloadPkg/Library/PlatformBootManagerLib/PlatformBootManagerLib.inf
View File

@ -60,7 +60,6 @@
gEfiBootLogoProtocolGuid ## CONSUMES gEfiBootLogoProtocolGuid ## CONSUMES
gEfiDxeSmmReadyToLockProtocolGuid gEfiDxeSmmReadyToLockProtocolGuid
gEfiSmmAccess2ProtocolGuid gEfiSmmAccess2ProtocolGuid
gUniversalPayloadPlatformBootManagerOverrideProtocolGuid
gEfiSerialIoProtocolGuid gEfiSerialIoProtocolGuid
gEfiPciRootBridgeIoProtocolGuid gEfiPciRootBridgeIoProtocolGuid

2
UefiPayloadPkg/UefiPayloadPkg.dec
View File

@ -52,8 +52,6 @@
# #
gPlatformGOPPolicyGuid = { 0xec2e931b, 0x3281, 0x48a5, { 0x81, 0x07, 0xdf, 0x8a, 0x8b, 0xed, 0x3c, 0x5d } } gPlatformGOPPolicyGuid = { 0xec2e931b, 0x3281, 0x48a5, { 0x81, 0x07, 0xdf, 0x8a, 0x8b, 0xed, 0x3c, 0x5d } }
gUniversalPayloadPlatformBootManagerOverrideProtocolGuid = { 0xdb3fc2df, 0x7376, 0x4a8d, { 0x82, 0xab, 0x91, 0x54, 0xa1, 0x36, 0xa6, 0x5a } }
################################################################################ ################################################################################
# #
# PCD Declarations section - list of all PCDs Declared by this Package # PCD Declarations section - list of all PCDs Declared by this Package