Vlv2TbltDevicePkg: Find UEFI Shell using gUefiShellFileGuid

Remove use of PCD PcdShellFile from the IntelFrameworkModulePkg
and instead use gUefiShellFileGuid to find the UEFI Shell in
an FV.

Cc: Zailiang Sun <zailiang.sun@intel.com>
Cc: Yi Qian <yi.qian@intel.com>
Signed-off-by: Michael D Kinney <michael.d.kinney@intel.com>
Reviewed-by: Zailiang Sun <zailiang.sun@intel.com>
Reviewed-by: Yi Qian <yi.qian@intel.com>

diff --git a/Vlv2TbltDevicePkg/Library/PlatformBdsLib/BdsPlatform.c b/Vlv2TbltDevicePkg/Library/PlatformBdsLib/BdsPlatform.c
index 0f0e15c64af33e7ae1b51dd95002c1fa15291baa..e86c6b3e2e7cedd2241fc0e7298e129a82e6dd45 100644 (file)
--- a/Vlv2TbltDevicePkg/Library/PlatformBdsLib/BdsPlatform.c
+++ b/Vlv2TbltDevicePkg/Library/PlatformBdsLib/BdsPlatform.c
@@ -1356,7 +1356,7 @@ PlatformBdsLibEnumerateAllBootOption (
 \r
     Status = Fv->ReadFile (\r
                   Fv,\r
-                  PcdGetPtr(PcdShellFile),\r
+                  &gUefiShellFileGuid,\r
                   NULL,\r
                   &Size,\r
                   &Type,\r
@@ -1528,7 +1528,7 @@ PlatformBdsLibEnumerateAllBootOption (
 \r
     Status = Fv->ReadFile (\r
                   Fv,\r
-                  PcdGetPtr(PcdShellFile),\r
+                  &gUefiShellFileGuid,\r
                   NULL,\r
                   &Size,\r
                   &Type,\r

diff --git a/Vlv2TbltDevicePkg/Library/PlatformBdsLib/PlatformBdsLib.inf b/Vlv2TbltDevicePkg/Library/PlatformBdsLib/PlatformBdsLib.inf
index 5831569fae05ce3e6fbb58117462d48499b3140e..d3bef0fa39337908af768be172d2f9cddb06204c 100644 (file)
--- a/Vlv2TbltDevicePkg/Library/PlatformBdsLib/PlatformBdsLib.inf
+++ b/Vlv2TbltDevicePkg/Library/PlatformBdsLib/PlatformBdsLib.inf
@@ -1,11 +1,13 @@
 #/** @file\r
 # Component name for module PlatformBootManagerLib\r
 #\r
-# Copyright (c) 2008  - 2016, Intel Corporation. All rights reserved.<BR>\r
-#                                                                                  \r\r
+# Copyright (c) 2008  - 2019, Intel Corporation. All rights reserved.<BR>\r
+#\r
+\r
 # SPDX-License-Identifier: BSD-2-Clause-Patent\r
 \r
-#                                                                                  \r\r
+#\r
+\r
 #\r
 #\r
 #\r
@@ -97,6 +99,7 @@
   gEfiNormalSetupGuid\r
   gEfiPartTypeSystemPartGuid\r
   gEfiEndOfDxeEventGroupGuid\r
+  gUefiShellFileGuid\r
 \r
 [Pcd]\r
   gEfiSignedCapsulePkgTokenSpaceGuid.PcdEdkiiRsa2048Sha256TestPublicKeyFileGuid\r
@@ -111,7 +114,6 @@
   gPlatformModuleTokenSpaceGuid.PcdFlashFvShellSize\r
   gEfiMdePkgTokenSpaceGuid.PcdPlatformBootTimeOut\r
   gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdLogoFile\r
-  gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdShellFile\r
   gPlatformModuleTokenSpaceGuid.PcdIFWISigBaseAddress\r
   gEfiMdeModulePkgTokenSpaceGuid.PcdConOutRow\r
   gEfiMdeModulePkgTokenSpaceGuid.PcdConOutColumn\r

diff --git a/Vlv2TbltDevicePkg/Override/IntelFrameworkModulePkg/Library/GenericBdsLib/BdsBoot.c b/Vlv2TbltDevicePkg/Override/IntelFrameworkModulePkg/Library/GenericBdsLib/BdsBoot.c
index b875041880854a0c64d53d69f2aea4eeb52e6b8e..3034853695645fe9505018f32c737d4d10d4b864 100644 (file)
--- a/Vlv2TbltDevicePkg/Override/IntelFrameworkModulePkg/Library/GenericBdsLib/BdsBoot.c
+++ b/Vlv2TbltDevicePkg/Override/IntelFrameworkModulePkg/Library/GenericBdsLib/BdsBoot.c
@@ -1,7 +1,7 @@
 /** @file\r
   BDS Lib functions which relate with create or process the boot option.\r
 \r
-Copyright (c) 2004 - 2018, Intel Corporation. All rights reserved.<BR>\r
+Copyright (c) 2004 - 2019, Intel Corporation. All rights reserved.<BR>\r
 SPDX-License-Identifier: BSD-2-Clause-Patent\r
 \r
 **/\r
@@ -2342,7 +2342,7 @@ BdsLibBootViaBootOption (
     //\r
     // If the boot option point to Internal FV shell, make sure it is valid\r
     //\r
-    Status = BdsLibUpdateFvFileDevicePath (&DevicePath, PcdGetPtr(PcdShellFile));\r
+    Status = BdsLibUpdateFvFileDevicePath (&DevicePath, &gUefiShellFileGuid);\r
     if (!EFI_ERROR(Status)) {\r
       if (Option->DevicePath != NULL) {\r
         FreePool(Option->DevicePath);\r
@@ -3544,7 +3544,7 @@ BdsLibEnumerateAllBootOption (
 \r
     Status = Fv->ReadFile (\r
                   Fv,\r
-                  PcdGetPtr(PcdShellFile),\r
+                  &gUefiShellFileGuid,\r
                   NULL,\r
                   &Size,\r
                   &Type,\r
@@ -3629,7 +3629,7 @@ BdsLibBuildOptionFromShell (
   //\r
   // Build the shell device path\r
   //\r
-  EfiInitializeFwVolDevicepathNode (&ShellNode, PcdGetPtr(PcdShellFile));\r
+  EfiInitializeFwVolDevicepathNode (&ShellNode, &gUefiShellFileGuid);\r
 \r
   DevicePath = AppendDevicePathNode (DevicePath, (EFI_DEVICE_PATH_PROTOCOL *) &ShellNode);\r
 \r

diff --git a/Vlv2TbltDevicePkg/Override/IntelFrameworkModulePkg/Library/GenericBdsLib/GenericBdsLib.inf b/Vlv2TbltDevicePkg/Override/IntelFrameworkModulePkg/Library/GenericBdsLib/GenericBdsLib.inf
index a978b5cbfa9abfcfcdcd6e6e5f7a00d8b0586031..e3c8a6fa272202e815eac6f860427f4743602d84 100644 (file)
--- a/Vlv2TbltDevicePkg/Override/IntelFrameworkModulePkg/Library/GenericBdsLib/GenericBdsLib.inf
+++ b/Vlv2TbltDevicePkg/Override/IntelFrameworkModulePkg/Library/GenericBdsLib/GenericBdsLib.inf
@@ -6,7 +6,7 @@
 #  2) BDS boot device connect interface;\r
 #  3) BDS Misc interfaces for mainting boot variable, ouput string, etc.\r
 #  \r
-#  Copyright (c) 2007 - 2018, Intel Corporation. All rights reserved.<BR>\r
+#  Copyright (c) 2007 - 2019, Intel Corporation. All rights reserved.<BR>\r
 #  SPDX-License-Identifier: BSD-2-Clause-Patent\r
 #  \r
 ##\r
@@ -43,6 +43,7 @@
   MdeModulePkg/MdeModulePkg.dec\r
   IntelFrameworkPkg/IntelFrameworkPkg.dec\r
   IntelFrameworkModulePkg/IntelFrameworkModulePkg.dec\r
+  ShellPkg/ShellPkg.dec\r
 \r
 [LibraryClasses]\r
   DevicePathLib\r
@@ -98,6 +99,7 @@
   ## SOMETIMES_CONSUMES ## Variable:L"LegacyDevOrder"\r
   gEfiLegacyDevOrderVariableGuid\r
   gEdkiiStatusCodeDataTypeVariableGuid          ## SOMETIMES_CONSUMES ## GUID\r
+  gUefiShellFileGuid\r
 \r
 [Protocols]\r
   gEfiSimpleFileSystemProtocolGuid              ## SOMETIMES_CONSUMES\r
@@ -131,7 +133,6 @@
   gEfiMdeModulePkgTokenSpaceGuid.PcdProgressCodeOsLoaderLoad  ## SOMETIMES_CONSUMES\r
   gEfiMdeModulePkgTokenSpaceGuid.PcdProgressCodeOsLoaderStart ## SOMETIMES_CONSUMES\r
   gEfiMdeModulePkgTokenSpaceGuid.PcdErrorCodeSetVariable      ## CONSUMES\r
-  gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdShellFile      ## CONSUMES\r
   gEfiMdeModulePkgTokenSpaceGuid.PcdTestKeyUsed                       ## CONSUMES\r
 \r
 #\r