Reviewed-by: Jaben Carsey <[email protected]>
> -----Original Message----- > From: edk2-devel [mailto:[email protected]] On Behalf Of > Ruiyu Ni > Sent: Tuesday, September 15, 2015 11:10 PM > To: [email protected] > Cc: Ni, Ruiyu <[email protected]>; Jin, Eric <[email protected]> > Subject: [edk2] [Patch] Nt32Pkg: Fix PlatformBootManagerLib to respect > PcdShellFile. > Importance: High > > Fix the code to use PcdShellFile instead of using hard code GUID > which always points to new UEFI shell. > > Contributed-under: TianoCore Contribution Agreement 1.0 > Signed-off-by: Ruiyu Ni <[email protected]> > Cc: Eric Jin <[email protected]> > --- > Nt32Pkg/Library/PlatformBootManagerLib/PlatformBootManager.c | 5 +-- > -- > 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 3f634fc..e944105 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 d617538..9b1eeab 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 > -- > 1.9.5.msysgit.1 > > _______________________________________________ > edk2-devel mailing list > [email protected] > https://lists.01.org/mailman/listinfo/edk2-devel _______________________________________________ edk2-devel mailing list [email protected] https://lists.01.org/mailman/listinfo/edk2-devel
