remove unnecessary EFI64_SHADOW_ALL_LEGACY_ROM in GenericBdsLib.

[mirror_edk2.git] / IntelFrameworkModulePkg / Library / GenericBdsLib / BdsBoot.c

diff --git a/IntelFrameworkModulePkg/Library/GenericBdsLib/BdsBoot.c b/IntelFrameworkModulePkg/Library/GenericBdsLib/BdsBoot.c
index 59e3a6e20f592ce9ba5b7048e0bfb6bfb2a49e67..2d98d73eeaf6ac92403fb0346d9af1c90bb52de0 100644 (file)
--- a/IntelFrameworkModulePkg/Library/GenericBdsLib/BdsBoot.c
+++ b/IntelFrameworkModulePkg/Library/GenericBdsLib/BdsBoot.c
@@ -1,8 +1,8 @@
 /** @file\r
   BDS Lib functions which relate with create or process the boot option.\r
 \r
-Copyright (c) 2004 - 2010, Intel Corporation. <BR>\r
-All rights reserved. This program and the accompanying materials\r
+Copyright (c) 2004 - 2010, 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
 http://opensource.org/licenses/bsd-license.php\r
@@ -199,11 +199,6 @@ BdsLibBootViaBootOption (
   *ExitDataSize = 0;\r
   *ExitData     = NULL;\r
 \r
-  //\r
-  // Notes: put EFI64 ROM Shadow Solution\r
-  //\r
-  EFI64_SHADOW_ALL_LEGACY_ROM ();\r
-\r
   //\r
   // Notes: this code can be remove after the s3 script table\r
   // hook on the event EVT_SIGNAL_READY_TO_BOOT or\r
@@ -1453,6 +1448,11 @@ BdsLibGetBootableHandle (
       gBS->ConnectController (Handle, NULL, NULL, TRUE);\r
     }\r
   } else {\r
+    //\r
+    // For removable device boot option, its contained device path only point to the removable device handle, \r
+    // should make sure all its children handles (its child partion or media handles) are created and connected. \r
+    //\r
+    gBS->ConnectController (Handle, NULL, NULL, TRUE); \r
     //\r
     // Get BlockIo protocol and check removable attribute\r
     //\r