diff options
author | Ruiyu Ni <ruiyu.ni@intel.com> | 2016-06-22 14:00:41 +0800 |
---|---|---|
committer | Ruiyu Ni <ruiyu.ni@intel.com> | 2016-06-22 14:00:41 +0800 |
commit | 59e2626181051dec0068bc4fcce9a88b9c8f084e (patch) | |
tree | dc615f96d0cfe39b372d7027938ca66e096d5bab /MdeModulePkg/Universal | |
parent | cbedba8698b1a9f6e2e440219d03a263e09d2822 (diff) | |
download | edk2-59e2626181051dec0068bc4fcce9a88b9c8f084e.tar.gz edk2-59e2626181051dec0068bc4fcce9a88b9c8f084e.tar.bz2 edk2-59e2626181051dec0068bc4fcce9a88b9c8f084e.zip |
Revert "MdeModulePkg/Bds: Do not boot to UI again when BootNext points to UI"
This reverts commit dd85dd0731e971c5782fb94b2cbac8669b33312b.
Diffstat (limited to 'MdeModulePkg/Universal')
-rw-r--r-- | MdeModulePkg/Universal/BdsDxe/BdsEntry.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/MdeModulePkg/Universal/BdsDxe/BdsEntry.c b/MdeModulePkg/Universal/BdsDxe/BdsEntry.c index 741ddc302b..3734ff954d 100644 --- a/MdeModulePkg/Universal/BdsDxe/BdsEntry.c +++ b/MdeModulePkg/Universal/BdsDxe/BdsEntry.c @@ -6,7 +6,7 @@ to enter BDS phase.
(C) Copyright 2015 Hewlett-Packard Development Company, L.P.<BR>
-Copyright (c) 2004 - 2016, Intel Corporation. All rights reserved.<BR>
+Copyright (c) 2004 - 2015, Intel Corporation. All rights reserved.<BR>
This program and the accompanying materials
are licensed and made available under the terms and conditions of the BSD License
which accompanies this distribution. The full text of the license may be found at
@@ -923,10 +923,9 @@ BdsEntry ( if (!EFI_ERROR (Status)) {
EfiBootManagerBoot (&LoadOption);
EfiBootManagerFreeLoadOption (&LoadOption);
- if ((LoadOption.Status == EFI_SUCCESS) && (LoadOption.OptionNumber != BootManagerMenu.OptionNumber)) {
+ if (LoadOption.Status == EFI_SUCCESS) {
//
// Boot to Boot Manager Menu upon EFI_SUCCESS
- // Exception: Do not boot again when the BootNext points to Boot Manager Menu.
//
EfiBootManagerBoot (&BootManagerMenu);
}
|