Revision: 18479
http://sourceforge.net/p/edk2/code/18479
Author: hwu1225
Date: 2015-09-16 08:16:16 +0000 (Wed, 16 Sep 2015)
Log Message:
-----------
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 <[email protected]>
Reviewed-by: Eric Jin <[email protected]>
Revision Links:
--------------
http://sourceforge.net/p/edk2/code/18478
Modified Paths:
--------------
branches/UDK2015/Nt32Pkg/Library/PlatformBootManagerLib/PlatformBootManager.c
branches/UDK2015/Nt32Pkg/Library/PlatformBootManagerLib/PlatformBootManagerLib.inf
Modified:
branches/UDK2015/Nt32Pkg/Library/PlatformBootManagerLib/PlatformBootManager.c
===================================================================
---
branches/UDK2015/Nt32Pkg/Library/PlatformBootManagerLib/PlatformBootManager.c
2015-09-16 08:04:35 UTC (rev 18478)
+++
branches/UDK2015/Nt32Pkg/Library/PlatformBootManagerLib/PlatformBootManager.c
2015-09-16 08:16:16 UTC (rev 18479)
@@ -15,9 +15,6 @@
#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 @@
//
// Register UEFI Shell
//
- PlatformRegisterFvBootOption (&mUefiShellFileGuid, L"UEFI Shell",
LOAD_OPTION_ACTIVE);
+ PlatformRegisterFvBootOption (PcdGetPtr (PcdShellFile), L"UEFI Shell",
LOAD_OPTION_ACTIVE);
}
/**
Modified:
branches/UDK2015/Nt32Pkg/Library/PlatformBootManagerLib/PlatformBootManagerLib.inf
===================================================================
---
branches/UDK2015/Nt32Pkg/Library/PlatformBootManagerLib/PlatformBootManagerLib.inf
2015-09-16 08:04:35 UTC (rev 18478)
+++
branches/UDK2015/Nt32Pkg/Library/PlatformBootManagerLib/PlatformBootManagerLib.inf
2015-09-16 08:16:16 UTC (rev 18479)
@@ -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
------------------------------------------------------------------------------
Monitor Your Dynamic Infrastructure at Any Scale With Datadog!
Get real-time metrics from all of your servers, apps and tools
in one place.
SourceForge users - Click here to start your Free Trial of Datadog now!
http://pubads.g.doubleclick.net/gampad/clk?id=241902991&iu=/4140
_______________________________________________
edk2-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/edk2-commits
