| Message ID | 1490191448-22398-3-git-send-email-ard.biesheuvel@linaro.org |
|---|---|
| State | Accepted |
| Commit | 93c4bb63decedec4c28a59f404730fc68ce77faf |
| Headers | show |
| Series | Shell/Quark/ArmPkg: promote shell app FILE_GUID to proper GUID | expand |
Reviewed-by: Michael Kinney <michael.d.kinney@intel.com> Mike > -----Original Message----- > From: Ard Biesheuvel [mailto:ard.biesheuvel@linaro.org] > Sent: Wednesday, March 22, 2017 7:04 AM > To: edk2-devel@lists.01.org; leif.lindholm@linaro.org; lersek@redhat.com; Carsey, > Jaben <jaben.carsey@intel.com>; Ni, Ruiyu <ruiyu.ni@intel.com>; Kinney, Michael D > <michael.d.kinney@intel.com>; Steele, Kelly <kelly.steele@intel.com> > Cc: Ard Biesheuvel <ard.biesheuvel@linaro.org> > Subject: [PATCH 2/4] QuarkPlatformPkg/PlatformBootManagerLib: use new > UefiShellFileGuid definition > > Move to the new definition of UefiShellFileGuid, which is defined in the > ShellPkg package declaration file rather than hardcoded in this module. > > Contributed-under: TianoCore Contribution Agreement 1.0 > Signed-off-by: Ard Biesheuvel <ard.biesheuvel@linaro.org> > --- > QuarkPlatformPkg/Library/PlatformBootManagerLib/PlatformBootManager.c | 4 +--- > QuarkPlatformPkg/Library/PlatformBootManagerLib/PlatformBootManagerLib.inf | 2 ++ > 2 files changed, 3 insertions(+), 3 deletions(-) > > diff --git a/QuarkPlatformPkg/Library/PlatformBootManagerLib/PlatformBootManager.c > b/QuarkPlatformPkg/Library/PlatformBootManagerLib/PlatformBootManager.c > index b61eb03360a2..3c213180690d 100644 > --- a/QuarkPlatformPkg/Library/PlatformBootManagerLib/PlatformBootManager.c > +++ b/QuarkPlatformPkg/Library/PlatformBootManagerLib/PlatformBootManager.c > @@ -15,8 +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 }}; > - > /** > Return the index of the load option in the load option array. > > @@ -246,7 +244,7 @@ PlatformBootManagerBeforeConsole ( > // > // Register UEFI Shell > // > - PlatformRegisterFvBootOption (&mUefiShellFileGuid, L"UEFI Shell", > LOAD_OPTION_ACTIVE); > + PlatformRegisterFvBootOption (&gUefiShellFileGuid, L"UEFI Shell", > LOAD_OPTION_ACTIVE); > > Status = gBS->LocateProtocol(&gEsrtManagementProtocolGuid, NULL, (VOID > **)&EsrtManagement); > if (EFI_ERROR(Status)) { > diff --git > a/QuarkPlatformPkg/Library/PlatformBootManagerLib/PlatformBootManagerLib.inf > b/QuarkPlatformPkg/Library/PlatformBootManagerLib/PlatformBootManagerLib.inf > index af399e529a92..25394d8ca000 100644 > --- a/QuarkPlatformPkg/Library/PlatformBootManagerLib/PlatformBootManagerLib.inf > +++ b/QuarkPlatformPkg/Library/PlatformBootManagerLib/PlatformBootManagerLib.inf > @@ -40,6 +40,7 @@ [Packages] > SourceLevelDebugPkg/SourceLevelDebugPkg.dec > QuarkPlatformPkg/QuarkPlatformPkg.dec > SecurityPkg/SecurityPkg.dec > + ShellPkg/ShellPkg.dec > SignedCapsulePkg/SignedCapsulePkg.dec > > [LibraryClasses] > @@ -70,6 +71,7 @@ [Guids] > gEfiVTUTF8Guid > gEfiTtyTermGuid > gEfiEndOfDxeEventGroupGuid > + gUefiShellFileGuid > > [Pcd] > gEfiMdePkgTokenSpaceGuid.PcdUartDefaultBaudRate > -- > 2.7.4 _______________________________________________ edk2-devel mailing list edk2-devel@lists.01.org https://lists.01.org/mailman/listinfo/edk2-devel
diff --git a/QuarkPlatformPkg/Library/PlatformBootManagerLib/PlatformBootManager.c b/QuarkPlatformPkg/Library/PlatformBootManagerLib/PlatformBootManager.c index b61eb03360a2..3c213180690d 100644 --- a/QuarkPlatformPkg/Library/PlatformBootManagerLib/PlatformBootManager.c +++ b/QuarkPlatformPkg/Library/PlatformBootManagerLib/PlatformBootManager.c @@ -15,8 +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 }}; - /** Return the index of the load option in the load option array. @@ -246,7 +244,7 @@ PlatformBootManagerBeforeConsole ( // // Register UEFI Shell // - PlatformRegisterFvBootOption (&mUefiShellFileGuid, L"UEFI Shell", LOAD_OPTION_ACTIVE); + PlatformRegisterFvBootOption (&gUefiShellFileGuid, L"UEFI Shell", LOAD_OPTION_ACTIVE); Status = gBS->LocateProtocol(&gEsrtManagementProtocolGuid, NULL, (VOID **)&EsrtManagement); if (EFI_ERROR(Status)) { diff --git a/QuarkPlatformPkg/Library/PlatformBootManagerLib/PlatformBootManagerLib.inf b/QuarkPlatformPkg/Library/PlatformBootManagerLib/PlatformBootManagerLib.inf index af399e529a92..25394d8ca000 100644 --- a/QuarkPlatformPkg/Library/PlatformBootManagerLib/PlatformBootManagerLib.inf +++ b/QuarkPlatformPkg/Library/PlatformBootManagerLib/PlatformBootManagerLib.inf @@ -40,6 +40,7 @@ [Packages] SourceLevelDebugPkg/SourceLevelDebugPkg.dec QuarkPlatformPkg/QuarkPlatformPkg.dec SecurityPkg/SecurityPkg.dec + ShellPkg/ShellPkg.dec SignedCapsulePkg/SignedCapsulePkg.dec [LibraryClasses] @@ -70,6 +71,7 @@ [Guids] gEfiVTUTF8Guid gEfiTtyTermGuid gEfiEndOfDxeEventGroupGuid + gUefiShellFileGuid [Pcd] gEfiMdePkgTokenSpaceGuid.PcdUartDefaultBaudRate
Move to the new definition of UefiShellFileGuid, which is defined in the ShellPkg package declaration file rather than hardcoded in this module. Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: Ard Biesheuvel <ard.biesheuvel@linaro.org> --- QuarkPlatformPkg/Library/PlatformBootManagerLib/PlatformBootManager.c | 4 +--- QuarkPlatformPkg/Library/PlatformBootManagerLib/PlatformBootManagerLib.inf | 2 ++ 2 files changed, 3 insertions(+), 3 deletions(-) -- 2.7.4 _______________________________________________ edk2-devel mailing list edk2-devel@lists.01.org https://lists.01.org/mailman/listinfo/edk2-devel