Revert "MdeModulePkg/Bds: Do not boot to UI again when BootNext points to UI"

This reverts commit dd85dd0731e971c5782fb94b2cbac8669b33312b.

diff --git a/MdeModulePkg/Universal/BdsDxe/BdsEntry.c b/MdeModulePkg/Universal/BdsDxe/BdsEntry.c
index 741ddc302bbcb2c87cdcdc5617ac76744f91285a..3734ff954da292d000ad1020a72baf39d2b80485 100644 (file)
--- a/MdeModulePkg/Universal/BdsDxe/BdsEntry.c
+++ b/MdeModulePkg/Universal/BdsDxe/BdsEntry.c
@@ -6,7 +6,7 @@
   to enter BDS phase.\r
 \r
 (C) Copyright 2015 Hewlett-Packard Development Company, L.P.<BR>\r
-Copyright (c) 2004 - 2016, Intel Corporation. All rights reserved.<BR>\r
+Copyright (c) 2004 - 2015, Intel Corporation. All rights reserved.<BR>\r
 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions of the BSD License\r
 which accompanies this distribution.  The full text of the license may be found at\r
@@ -923,10 +923,9 @@ BdsEntry (
       if (!EFI_ERROR (Status)) {\r
         EfiBootManagerBoot (&LoadOption);\r
         EfiBootManagerFreeLoadOption (&LoadOption);\r
-        if ((LoadOption.Status == EFI_SUCCESS) && (LoadOption.OptionNumber != BootManagerMenu.OptionNumber)) {\r
+        if (LoadOption.Status == EFI_SUCCESS) {\r
           //\r
           // Boot to Boot Manager Menu upon EFI_SUCCESS\r
-          // Exception: Do not boot again when the BootNext points to Boot Manager Menu.\r
           //\r
           EfiBootManagerBoot (&BootManagerMenu);\r
         }\r