From c62dbf318535e2560ff56ba4afe7f082e4b4832a Mon Sep 17 00:00:00 2001
From: klu2 <klu2@6f19259b-4bc3-4df7-8a09-765794883524>
Date: Thu, 26 Feb 2009 10:33:51 +0000
Subject: [PATCH] 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
---
 IntelFrameworkModulePkg/Library/GenericBdsLib/BdsBoot.c     | 6 +++---
 .../Library/GenericBdsLib/GenericBdsLib.inf                 | 2 --
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/IntelFrameworkModulePkg/Library/GenericBdsLib/BdsBoot.c b/IntelFrameworkModulePkg/Library/GenericBdsLib/BdsBoot.c
index 08ddc90ef6..df8be070e7 100644
--- 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
     //  machinename is ia32, ia64, x64, ...
     //
-    FilePath = FileDevicePath (Handle, (CONST CHAR16*)PcdGetPtr(PcdDefaultBootFileName));
+    FilePath = FileDevicePath (Handle, EFI_REMOVABLE_MEDIA_FILE_NAME);
     if (FilePath != NULL) {
       Status = gBS->LoadImage (
                       TRUE,
@@ -1050,7 +1050,7 @@ BdsLibEnumerateAllBootOption (
     NeedDelete = TRUE;
     Status     = BdsLibGetImageHeader (
                    FileSystemHandles[Index],
-                   (CHAR16*)PcdGetPtr (PcdDefaultBootFileName),
+                   EFI_REMOVABLE_MEDIA_FILE_NAME,
                    &DosHeader,
                    Hdr
                    );
@@ -1408,7 +1408,7 @@ BdsLibGetBootableHandle (
       Hdr.Union = &HdrData;
       Status = BdsLibGetImageHeader (
                  SimpleFileSystemHandles[Index],
-                 (CHAR16*)PcdGetPtr(PcdDefaultBootFileName),
+                 EFI_REMOVABLE_MEDIA_FILE_NAME,
                  &DosHeader,
                  Hdr
                  );
diff --git a/IntelFrameworkModulePkg/Library/GenericBdsLib/GenericBdsLib.inf b/IntelFrameworkModulePkg/Library/GenericBdsLib/GenericBdsLib.inf
index baa777df2c..e9d4befe3d 100644
--- a/IntelFrameworkModulePkg/Library/GenericBdsLib/GenericBdsLib.inf
+++ b/IntelFrameworkModulePkg/Library/GenericBdsLib/GenericBdsLib.inf
@@ -112,5 +112,3 @@
 [FeaturePcd.common]
   gEfiMdePkgTokenSpaceGuid.PcdUgaConsumeSupport
 
-[Pcd]
-  gEfiMdeModulePkgTokenSpaceGuid.PcdDefaultBootFileName