diff options
| author | Ruiyu Ni <ruiyu.ni@intel.com> | 2015-09-16 08:16:16 +0000 |
|---|---|---|
| committer | hwu1225 <hwu1225@Edk2> | 2015-09-16 08:16:16 +0000 |
| commit | a42b7ff22dd12b231bff598970888e8f91ffc6a1 (patch) | |
| tree | 8b6b2bf9e731bfd09d0a89621a4724036c47e7a6 /Nt32Pkg | |
| parent | 9f97f1253778216c41e9e4796333526669f24b0a (diff) | |
| download | edk2-platforms-a42b7ff22dd12b231bff598970888e8f91ffc6a1.tar.xz | |
Nt32Pkg: Fix PlatformBootManagerLib to respect PcdShellFile.
Fix the code to use PcdShellFile instead of using hard code GUID
which always points to new UEFI shell.
(Sync patch r18478 from main trunk.)
Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Ruiyu Ni <ruiyu.ni@intel.com>
Reviewed-by: Eric Jin <eric.jin@intel.com>
git-svn-id: https://svn.code.sf.net/p/edk2/code/branches/UDK2015@18479 6f19259b-4bc3-4df7-8a09-765794883524
Diffstat (limited to 'Nt32Pkg')
| -rw-r--r-- | Nt32Pkg/Library/PlatformBootManagerLib/PlatformBootManager.c | 5 | ||||
| -rw-r--r-- | Nt32Pkg/Library/PlatformBootManagerLib/PlatformBootManagerLib.inf | 5 |
2 files changed, 4 insertions, 6 deletions
diff --git a/Nt32Pkg/Library/PlatformBootManagerLib/PlatformBootManager.c b/Nt32Pkg/Library/PlatformBootManagerLib/PlatformBootManager.c index 3f634fcff9..e944105b39 100644 --- a/Nt32Pkg/Library/PlatformBootManagerLib/PlatformBootManager.c +++ b/Nt32Pkg/Library/PlatformBootManagerLib/PlatformBootManager.c @@ -15,9 +15,6 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. #include "PlatformBootManager.h"
-
-EFI_GUID mUefiShellFileGuid = { 0x7C04A583, 0x9E3E, 0x4f1c, 0xAD, 0x65, 0xE0, 0x52, 0x68, 0xD0, 0xB4, 0xD1 };
-
/**
Perform the platform diagnostic, such like test memory. OEM/IBV also
can customize this function to support specific platform diagnostic.
@@ -220,7 +217,7 @@ PlatformBootManagerBeforeConsole ( //
// Register UEFI Shell
//
- PlatformRegisterFvBootOption (&mUefiShellFileGuid, L"UEFI Shell", LOAD_OPTION_ACTIVE);
+ PlatformRegisterFvBootOption (PcdGetPtr (PcdShellFile), L"UEFI Shell", LOAD_OPTION_ACTIVE);
}
/**
diff --git a/Nt32Pkg/Library/PlatformBootManagerLib/PlatformBootManagerLib.inf b/Nt32Pkg/Library/PlatformBootManagerLib/PlatformBootManagerLib.inf index d617538058..9b1eeaba02 100644 --- a/Nt32Pkg/Library/PlatformBootManagerLib/PlatformBootManagerLib.inf +++ b/Nt32Pkg/Library/PlatformBootManagerLib/PlatformBootManagerLib.inf @@ -65,9 +65,10 @@ [Pcd]
gEfiMdePkgTokenSpaceGuid.PcdPlatformBootTimeOut
+ gEfiMdePkgTokenSpaceGuid.PcdUgaConsumeSupport
gEfiMdeModulePkgTokenSpaceGuid.PcdConOutRow
gEfiMdeModulePkgTokenSpaceGuid.PcdConOutColumn
- gEfiMdePkgTokenSpaceGuid.PcdUgaConsumeSupport
+ gEfiMdeModulePkgTokenSpaceGuid.PcdConInConnectOnDemand
gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdBootlogoOnlyEnable
gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdLogoFile
- gEfiMdeModulePkgTokenSpaceGuid.PcdConInConnectOnDemand
+ gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdShellFile
|