summaryrefslogtreecommitdiff
path: root/IntelFrameworkModulePkg/Universal/BdsDxe/BootMngr
diff options
context:
space:
mode:
authorniruiyu <niruiyu@6f19259b-4bc3-4df7-8a09-765794883524>2012-06-01 03:39:39 +0000
committerniruiyu <niruiyu@6f19259b-4bc3-4df7-8a09-765794883524>2012-06-01 03:39:39 +0000
commit16e5944abde9ea3f01c9ccff2a86a41e5a6a1dd0 (patch)
tree7cc5e5a08187212a83be8953ea9bbf2b7227d104 /IntelFrameworkModulePkg/Universal/BdsDxe/BootMngr
parent38fcd0270fff574ac82e2acad451fbcb36674398 (diff)
downloadedk2-platforms-16e5944abde9ea3f01c9ccff2a86a41e5a6a1dd0.tar.xz
Refine BdsDxe driver and GenericBdsLib library so that the GenericBdsLib doesn't depend on the BdsDxe implementation.
Signed-off-by: Ruiyu Ni <ruiyu.ni@intel.com> Reviewed-by: Eric Dong <eric.dong@intel.com> git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@13418 6f19259b-4bc3-4df7-8a09-765794883524
Diffstat (limited to 'IntelFrameworkModulePkg/Universal/BdsDxe/BootMngr')
-rw-r--r--IntelFrameworkModulePkg/Universal/BdsDxe/BootMngr/BootManager.c12
1 files changed, 10 insertions, 2 deletions
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;
}