REF: https://bugzilla.tianocore.org/show_bug.cgi?id=3384
Currently, UefiBootManagerLib has the below assumption: Assume the BootManagerMenuFile is in the same FV as the module links to this library. It has some limitation now, so remove the assumption. Cc: Jian J Wang <jian.j.w...@intel.com> Cc: Hao A Wu <hao.a...@intel.com> Cc: Zhichao Gao <zhichao....@intel.com> Cc: Ray Ni <ray...@intel.com> Signed-off-by: Zhiguang Liu <zhiguang....@intel.com> --- MdeModulePkg/Library/UefiBootManagerLib/BmBoot.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/MdeModulePkg/Library/UefiBootManagerLib/BmBoot.c b/MdeModulePkg/Library/UefiBootManagerLib/BmBoot.c index 6cc34d29c0..b8df4d590f 100644 --- a/MdeModulePkg/Library/UefiBootManagerLib/BmBoot.c +++ b/MdeModulePkg/Library/UefiBootManagerLib/BmBoot.c @@ -2,7 +2,7 @@ Library functions which relates with booting. Copyright (c) 2019, NVIDIA CORPORATION. All rights reserved. -Copyright (c) 2011 - 2020, Intel Corporation. All rights reserved.<BR> +Copyright (c) 2011 - 2021, Intel Corporation. All rights reserved.<BR> (C) Copyright 2015-2021 Hewlett Packard Enterprise Development LP<BR> SPDX-License-Identifier: BSD-2-Clause-Patent @@ -2385,7 +2385,6 @@ EfiBootManagerRefreshAllBootOption ( This function is called to get or create the boot option for the Boot Manager Menu. The Boot Manager Menu is shown after successfully booting a boot option. - Assume the BootManagerMenuFile is in the same FV as the module links to this library. @param BootOption Return the boot option of the Boot Manager Menu @@ -2437,7 +2436,7 @@ BmRegisterBootManagerMenu ( if (DevicePath == NULL) { Data = NULL; - Status = GetSectionFromFv ( + Status = GetSectionFromAnyFv ( PcdGetPtr (PcdBootManagerMenuFile), EFI_SECTION_PE32, 0, @@ -2455,7 +2454,7 @@ BmRegisterBootManagerMenu ( // // Get BootManagerMenu application's description from EFI User Interface Section. // - Status = GetSectionFromFv ( + Status = GetSectionFromAnyFv ( PcdGetPtr (PcdBootManagerMenuFile), EFI_SECTION_USER_INTERFACE, 0, -- 2.30.0.windows.2 -=-=-=-=-=-=-=-=-=-=-=- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#74859): https://edk2.groups.io/g/devel/message/74859 Mute This Topic: https://groups.io/mt/82714887/21656 Group Owner: devel+ow...@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-