[PATCH] [edk2-platforms]Intel/BoardModulePkg: Always sort load option


Zhiguang Liu
 

Currently, load option is only sorted when setup is the first priority in b=
oot option.
This condition is not needed because the below reasons:
1. Setup option may have different string name depending on platform side.
It shouldn't be hardcoded here.
2. Always sorting meets the needs that setup should not be the first priori=
ty

Cc: Eric Dong <eric.dong@...>
Cc: Liming Gao <gaoliming@...>
Cc: Nate DeSimone <nathaniel.l.desimone@...>
Cc: Prince Agyeman <prince.agyeman@...>

Signed-off-by: Zhiguang Liu <zhiguang.liu@...>
---
Platform/Intel/BoardModulePkg/Library/BoardBdsHookLib/BoardBdsHookLib.c | =
35 +----------------------------------
1 file changed, 1 insertion(+), 34 deletions(-)

diff --git a/Platform/Intel/BoardModulePkg/Library/BoardBdsHookLib/BoardBds=
HookLib.c b/Platform/Intel/BoardModulePkg/Library/BoardBdsHookLib/BoardBdsH=
ookLib.c
index d7612fb80a..60acf48dd6 100644
--- a/Platform/Intel/BoardModulePkg/Library/BoardBdsHookLib/BoardBdsHookLib=
.c
+++ b/Platform/Intel/BoardModulePkg/Library/BoardBdsHookLib/BoardBdsHookLib=
.c
@@ -992,37 +992,6 @@ ConnectSequence (
EfiBootManagerConnectAll ();=0D
}=0D
=0D
-=0D
-/**=0D
- The function is to consider the boot order which is not in our expectati=
on.=0D
- In the case that we need to re-sort the boot option.=0D
-=0D
- @retval TRUE Need to sort Boot Option.=0D
- @retval FALSE Don't need to sort Boot Option.=0D
-**/=0D
-BOOLEAN=0D
-IsNeedSortBootOption (=0D
- VOID=0D
- )=0D
-{=0D
- EFI_BOOT_MANAGER_LOAD_OPTION *BootOptions;=0D
- UINTN BootOptionCount;=0D
-=0D
- BootOptions =3D EfiBootManagerGetLoadOptions (&BootOptionCount, LoadOpti=
onTypeBoot);=0D
-=0D
- //=0D
- // If setup is the first priority in boot option, we need to sort boot o=
ption.=0D
- //=0D
- if ((BootOptionCount > 1) &&=0D
- (((StrnCmp (BootOptions->Description, L"Enter Setup", StrLen (L"Enter =
Setup"))) =3D=3D 0) ||=0D
- ((StrnCmp (BootOptions->Description, L"BootManagerMenuApp", StrLen (L"=
BootManagerMenuApp"))) =3D=3D 0))) {=0D
- return TRUE;=0D
- }=0D
-=0D
- return FALSE;=0D
-}=0D
-=0D
-=0D
/**=0D
Connects Root Bridge=0D
**/=0D
@@ -1383,7 +1352,5 @@ BdsAfterConsoleReadyBeforeBootOptionCallback (
=0D
EfiBootManagerRefreshAllBootOption ();=0D
=0D
- if (IsNeedSortBootOption()) {=0D
- EfiBootManagerSortLoadOptionVariable (LoadOptionTypeBoot, CompareBootO=
ption);=0D
- }=0D
+ EfiBootManagerSortLoadOptionVariable (LoadOptionTypeBoot, CompareBootOpt=
ion);=0D
}=0D
--=20
2.30.0.windows.2

Join devel@edk2.groups.io to automatically receive all group messages.