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>
Reviewed-by: Michael Kinney <michael.d.kinney@intel.com>

diff --git a/QuarkPlatformPkg/Library/PlatformBootManagerLib/PlatformBootManager.c b/QuarkPlatformPkg/Library/PlatformBootManagerLib/PlatformBootManager.c
index b61eb03360a2b4df043839f13b0866341a397a3b..3c213180690d740c55bfc2d4faaba9a1f06668b2 100644 (file)
--- 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.
 \r
 #include "PlatformBootManager.h"\r
 \r
-EFI_GUID mUefiShellFileGuid = {0x7C04A583, 0x9E3E, 0x4f1c, {0xAD, 0x65, 0xE0, 0x52, 0x68, 0xD0, 0xB4, 0xD1 }};\r
-\r
 /**\r
   Return the index of the load option in the load option array.\r
 \r
@@ -246,7 +244,7 @@ PlatformBootManagerBeforeConsole (
   //\r
   // Register UEFI Shell\r
   //\r
-  PlatformRegisterFvBootOption (&mUefiShellFileGuid, L"UEFI Shell", LOAD_OPTION_ACTIVE);\r
+  PlatformRegisterFvBootOption (&gUefiShellFileGuid, L"UEFI Shell", LOAD_OPTION_ACTIVE);\r
 \r
   Status = gBS->LocateProtocol(&gEsrtManagementProtocolGuid, NULL, (VOID **)&EsrtManagement);\r
   if (EFI_ERROR(Status)) {\r

diff --git a/QuarkPlatformPkg/Library/PlatformBootManagerLib/PlatformBootManagerLib.inf b/QuarkPlatformPkg/Library/PlatformBootManagerLib/PlatformBootManagerLib.inf
index af399e529a9286f978fab575aa5bd38d588bdbfa..25394d8ca0009802e43987264750ad88e48abaff 100644 (file)
--- a/QuarkPlatformPkg/Library/PlatformBootManagerLib/PlatformBootManagerLib.inf
+++ b/QuarkPlatformPkg/Library/PlatformBootManagerLib/PlatformBootManagerLib.inf
@@ -40,6 +40,7 @@
   SourceLevelDebugPkg/SourceLevelDebugPkg.dec\r
   QuarkPlatformPkg/QuarkPlatformPkg.dec\r
   SecurityPkg/SecurityPkg.dec\r
+  ShellPkg/ShellPkg.dec\r
   SignedCapsulePkg/SignedCapsulePkg.dec\r
 \r
 [LibraryClasses]\r
@@ -70,6 +71,7 @@
   gEfiVTUTF8Guid\r
   gEfiTtyTermGuid\r
   gEfiEndOfDxeEventGroupGuid\r
+  gUefiShellFileGuid\r
 \r
 [Pcd]\r
   gEfiMdePkgTokenSpaceGuid.PcdUartDefaultBaudRate\r