Use default boot file name from UefiSpec.h and retired related PCDs

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

diff --git a/IntelFrameworkModulePkg/Library/GenericBdsLib/BdsBoot.c b/IntelFrameworkModulePkg/Library/GenericBdsLib/BdsBoot.c
index 08ddc90ef63aa781abd8d916cc0a641472255559..df8be070e7a2567219071714799b4672d8372ce1 100644 (file)
--- a/IntelFrameworkModulePkg/Library/GenericBdsLib/BdsBoot.c
+++ b/IntelFrameworkModulePkg/Library/GenericBdsLib/BdsBoot.c
@@ -269,7 +269,7 @@ BdsLibBootViaBootOption (
     // Load the default boot file \EFI\BOOT\boot{machinename}.EFI from removable Media\r
     //  machinename is ia32, ia64, x64, ...\r
     //\r
-    FilePath = FileDevicePath (Handle, (CONST CHAR16*)PcdGetPtr(PcdDefaultBootFileName));\r
+    FilePath = FileDevicePath (Handle, EFI_REMOVABLE_MEDIA_FILE_NAME);\r
     if (FilePath != NULL) {\r
       Status = gBS->LoadImage (\r
                       TRUE,\r
@@ -1050,7 +1050,7 @@ BdsLibEnumerateAllBootOption (
     NeedDelete = TRUE;\r
     Status     = BdsLibGetImageHeader (\r
                    FileSystemHandles[Index],\r
-                   (CHAR16*)PcdGetPtr (PcdDefaultBootFileName),\r
+                   EFI_REMOVABLE_MEDIA_FILE_NAME,\r
                    &DosHeader,\r
                    Hdr\r
                    );\r
@@ -1408,7 +1408,7 @@ BdsLibGetBootableHandle (
       Hdr.Union = &HdrData;\r
       Status = BdsLibGetImageHeader (\r
                  SimpleFileSystemHandles[Index],\r
-                 (CHAR16*)PcdGetPtr(PcdDefaultBootFileName),\r
+                 EFI_REMOVABLE_MEDIA_FILE_NAME,\r
                  &DosHeader,\r
                  Hdr\r
                  );\r

diff --git a/IntelFrameworkModulePkg/Library/GenericBdsLib/GenericBdsLib.inf b/IntelFrameworkModulePkg/Library/GenericBdsLib/GenericBdsLib.inf
index baa777df2c977442a42173cba934820336d31f91..e9d4befe3df22331733336f97a7c4ee1a27f1d7c 100644 (file)
--- a/IntelFrameworkModulePkg/Library/GenericBdsLib/GenericBdsLib.inf
+++ b/IntelFrameworkModulePkg/Library/GenericBdsLib/GenericBdsLib.inf
@@ -112,5 +112,3 @@
 [FeaturePcd.common]\r
   gEfiMdePkgTokenSpaceGuid.PcdUgaConsumeSupport\r
 \r
-[Pcd]\r
-  gEfiMdeModulePkgTokenSpaceGuid.PcdDefaultBootFileName\r