Fix the bug that BDS assumes any boot option resides in the FV is Shell which causes...

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@11342 6f19259b-4bc3-4df7-8a09-765794883524

diff --git a/IntelFrameworkModulePkg/Library/GenericBdsLib/BdsBoot.c b/IntelFrameworkModulePkg/Library/GenericBdsLib/BdsBoot.c
index 0005eb38034995c5dfe7fbd81b1a45429b11e1ba..6f49ea1b520d99cf6b0ea17b5cbc7001c49e2bae 100644 (file)
--- a/IntelFrameworkModulePkg/Library/GenericBdsLib/BdsBoot.c
+++ b/IntelFrameworkModulePkg/Library/GenericBdsLib/BdsBoot.c
@@ -2326,14 +2326,17 @@ BdsLibIsValidEFIBootOptDevicePathExt (
   }\r
 \r
   //\r
-  // Check if it's a valid boot option for internal Shell\r
+  // Check if it's a valid boot option for internal FV application\r
   //\r
   if (EfiGetNameGuidFromFwVolDevicePathNode ((MEDIA_FW_VOL_FILEPATH_DEVICE_PATH *) LastDeviceNode) != NULL) {\r
     //\r
-    // If the boot option point to Internal FV shell, make sure it is valid\r
+    // If the boot option point to internal FV application, make sure it is valid\r
     //\r
     TempDevicePath = DevPath;\r
-    Status = BdsLibUpdateFvFileDevicePath (&TempDevicePath, PcdGetPtr(PcdShellFile));\r
+    Status = BdsLibUpdateFvFileDevicePath (\r
+               &TempDevicePath,\r
+               EfiGetNameGuidFromFwVolDevicePathNode ((MEDIA_FW_VOL_FILEPATH_DEVICE_PATH *) LastDeviceNode)\r
+               );\r
     if (Status == EFI_ALREADY_STARTED) {\r
       return TRUE;\r
     } else {\r