From 16e5944abde9ea3f01c9ccff2a86a41e5a6a1dd0 Mon Sep 17 00:00:00 2001 From: niruiyu Date: Fri, 1 Jun 2012 03:39:39 +0000 Subject: Refine BdsDxe driver and GenericBdsLib library so that the GenericBdsLib doesn't depend on the BdsDxe implementation. Signed-off-by: Ruiyu Ni Reviewed-by: Eric Dong git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@13418 6f19259b-4bc3-4df7-8a09-765794883524 --- .../Universal/BdsDxe/BootMngr/BootManager.c | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) (limited to 'IntelFrameworkModulePkg/Universal/BdsDxe/BootMngr') diff --git a/IntelFrameworkModulePkg/Universal/BdsDxe/BootMngr/BootManager.c b/IntelFrameworkModulePkg/Universal/BdsDxe/BootMngr/BootManager.c index a838c2ff7e..dc1364899e 100644 --- a/IntelFrameworkModulePkg/Universal/BdsDxe/BootMngr/BootManager.c +++ b/IntelFrameworkModulePkg/Universal/BdsDxe/BootMngr/BootManager.c @@ -232,6 +232,14 @@ CallBootManager ( BdsLibEnumerateAllBootOption (&mBootOptionsList); + // + // Group the legacy boot options for the same device type + // + GroupMultipleLegacyBootOption4SameType (); + + InitializeListHead (&mBootOptionsList); + BdsLibBuildOptionFromVar (&mBootOptionsList, L"BootOrder"); + HiiHandle = gBootManagerPrivate.HiiHandle; // @@ -268,9 +276,9 @@ CallBootManager ( mKeyInput++; // - // Don't display the boot option marked as LOAD_OPTION_HIDDEN + // Don't display the hidden/inactive boot option // - if ((Option->Attribute & LOAD_OPTION_HIDDEN) != 0) { + if (((Option->Attribute & LOAD_OPTION_HIDDEN) != 0) || ((Option->Attribute & LOAD_OPTION_ACTIVE) == 0)) { continue; } -- cgit v1.2.3