OvmfPkg: resolve PcdLib for PEIMs to PeiPcdLib by default

In the previous patch we had to add two explicit Null resolutions, but
here we can remove five PeiPcdLib ones, after setting the default to it.

Cc: Jordan Justen <jordan.l.justen@intel.com>
Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Laszlo Ersek <lersek@redhat.com>
Reviewed-by: Jordan Justen <jordan.l.justen@intel.com>

diff --git a/OvmfPkg/OvmfPkgIa32.dsc b/OvmfPkg/OvmfPkgIa32.dsc
index 4fc26c0c66a09c9eda65a2b2ce3ff14129c09298..bd115c9ced93dec6e3a403c7442e911fb9b4a7f5 100644 (file)
--- a/OvmfPkg/OvmfPkgIa32.dsc
+++ b/OvmfPkg/OvmfPkgIa32.dsc
@@ -256,6 +256,7 @@
   CpuExceptionHandlerLib|UefiCpuPkg/Library/CpuExceptionHandlerLib/PeiCpuExceptionHandlerLib.inf\r
   MpInitLib|UefiCpuPkg/Library/MpInitLib/PeiMpInitLib.inf\r
   QemuFwCfgS3Lib|OvmfPkg/Library/QemuFwCfgS3Lib/PeiQemuFwCfgS3LibFwCfg.inf\r
   CpuExceptionHandlerLib|UefiCpuPkg/Library/CpuExceptionHandlerLib/PeiCpuExceptionHandlerLib.inf\r
   MpInitLib|UefiCpuPkg/Library/MpInitLib/PeiMpInitLib.inf\r
   QemuFwCfgS3Lib|OvmfPkg/Library/QemuFwCfgS3Lib/PeiQemuFwCfgS3LibFwCfg.inf\r

+  PcdLib|MdePkg/Library/PeiPcdLib/PeiPcdLib.inf\r

 \r
 [LibraryClasses.common.DXE_CORE]\r
   HobLib|MdePkg/Library/DxeCoreHobLib/DxeCoreHobLib.inf\r
 \r
 [LibraryClasses.common.DXE_CORE]\r
   HobLib|MdePkg/Library/DxeCoreHobLib/DxeCoreHobLib.inf\r


@@ -567,32 +568,19 @@
     <LibraryClasses>\r
       PcdLib|MdePkg/Library/BasePcdLibNull/BasePcdLibNull.inf\r
   }\r
     <LibraryClasses>\r
       PcdLib|MdePkg/Library/BasePcdLibNull/BasePcdLibNull.inf\r
   }\r

-  MdeModulePkg/Core/DxeIplPeim/DxeIpl.inf {\r
-    <LibraryClasses>\r
-      PcdLib|MdePkg/Library/PeiPcdLib/PeiPcdLib.inf\r
-  }\r
+  MdeModulePkg/Core/DxeIplPeim/DxeIpl.inf\r

 \r
 \r

-  OvmfPkg/PlatformPei/PlatformPei.inf {\r
-    <LibraryClasses>\r
-      PcdLib|MdePkg/Library/PeiPcdLib/PeiPcdLib.inf\r
-  }\r
+  OvmfPkg/PlatformPei/PlatformPei.inf\r

   UefiCpuPkg/Universal/Acpi/S3Resume2Pei/S3Resume2Pei.inf {\r
     <LibraryClasses>\r
   UefiCpuPkg/Universal/Acpi/S3Resume2Pei/S3Resume2Pei.inf {\r
     <LibraryClasses>\r

-      PcdLib|MdePkg/Library/PeiPcdLib/PeiPcdLib.inf\r

 !if $(SMM_REQUIRE) == TRUE\r
       LockBoxLib|MdeModulePkg/Library/SmmLockBoxLib/SmmLockBoxPeiLib.inf\r
 !endif\r
   }\r
 !if $(SMM_REQUIRE) == TRUE\r
 !if $(SMM_REQUIRE) == TRUE\r
       LockBoxLib|MdeModulePkg/Library/SmmLockBoxLib/SmmLockBoxPeiLib.inf\r
 !endif\r
   }\r
 !if $(SMM_REQUIRE) == TRUE\r

-  OvmfPkg/SmmAccess/SmmAccessPei.inf {\r
-    <LibraryClasses>\r
-      PcdLib|MdePkg/Library/PeiPcdLib/PeiPcdLib.inf\r
-  }\r
+  OvmfPkg/SmmAccess/SmmAccessPei.inf\r

 !endif\r
 !endif\r

-  UefiCpuPkg/CpuMpPei/CpuMpPei.inf {\r
-    <LibraryClasses>\r
-      PcdLib|MdePkg/Library/PeiPcdLib/PeiPcdLib.inf\r
-  }\r
+  UefiCpuPkg/CpuMpPei/CpuMpPei.inf\r

 \r
   #\r
   # DXE Phase modules\r
 \r
   #\r
   # DXE Phase modules\r

diff --git a/OvmfPkg/OvmfPkgIa32X64.dsc b/OvmfPkg/OvmfPkgIa32X64.dsc
index b82c30656a837e2095b7eaab509d019a69686a9d..9727db84292243e234b3416ae22753952d2c38f9 100644 (file)
--- a/OvmfPkg/OvmfPkgIa32X64.dsc
+++ b/OvmfPkg/OvmfPkgIa32X64.dsc
@@ -261,6 +261,7 @@
   CpuExceptionHandlerLib|UefiCpuPkg/Library/CpuExceptionHandlerLib/PeiCpuExceptionHandlerLib.inf\r
   MpInitLib|UefiCpuPkg/Library/MpInitLib/PeiMpInitLib.inf\r
   QemuFwCfgS3Lib|OvmfPkg/Library/QemuFwCfgS3Lib/PeiQemuFwCfgS3LibFwCfg.inf\r
   CpuExceptionHandlerLib|UefiCpuPkg/Library/CpuExceptionHandlerLib/PeiCpuExceptionHandlerLib.inf\r
   MpInitLib|UefiCpuPkg/Library/MpInitLib/PeiMpInitLib.inf\r
   QemuFwCfgS3Lib|OvmfPkg/Library/QemuFwCfgS3Lib/PeiQemuFwCfgS3LibFwCfg.inf\r

+  PcdLib|MdePkg/Library/PeiPcdLib/PeiPcdLib.inf\r

 \r
 [LibraryClasses.common.DXE_CORE]\r
   HobLib|MdePkg/Library/DxeCoreHobLib/DxeCoreHobLib.inf\r
 \r
 [LibraryClasses.common.DXE_CORE]\r
   HobLib|MdePkg/Library/DxeCoreHobLib/DxeCoreHobLib.inf\r


@@ -575,32 +576,19 @@
     <LibraryClasses>\r
       PcdLib|MdePkg/Library/BasePcdLibNull/BasePcdLibNull.inf\r
   }\r
     <LibraryClasses>\r
       PcdLib|MdePkg/Library/BasePcdLibNull/BasePcdLibNull.inf\r
   }\r

-  MdeModulePkg/Core/DxeIplPeim/DxeIpl.inf {\r
-    <LibraryClasses>\r
-      PcdLib|MdePkg/Library/PeiPcdLib/PeiPcdLib.inf\r
-  }\r
+  MdeModulePkg/Core/DxeIplPeim/DxeIpl.inf\r

 \r
 \r

-  OvmfPkg/PlatformPei/PlatformPei.inf {\r
-    <LibraryClasses>\r
-      PcdLib|MdePkg/Library/PeiPcdLib/PeiPcdLib.inf\r
-  }\r
+  OvmfPkg/PlatformPei/PlatformPei.inf\r

   UefiCpuPkg/Universal/Acpi/S3Resume2Pei/S3Resume2Pei.inf {\r
     <LibraryClasses>\r
   UefiCpuPkg/Universal/Acpi/S3Resume2Pei/S3Resume2Pei.inf {\r
     <LibraryClasses>\r

-      PcdLib|MdePkg/Library/PeiPcdLib/PeiPcdLib.inf\r

 !if $(SMM_REQUIRE) == TRUE\r
       LockBoxLib|MdeModulePkg/Library/SmmLockBoxLib/SmmLockBoxPeiLib.inf\r
 !endif\r
   }\r
 !if $(SMM_REQUIRE) == TRUE\r
 !if $(SMM_REQUIRE) == TRUE\r
       LockBoxLib|MdeModulePkg/Library/SmmLockBoxLib/SmmLockBoxPeiLib.inf\r
 !endif\r
   }\r
 !if $(SMM_REQUIRE) == TRUE\r

-  OvmfPkg/SmmAccess/SmmAccessPei.inf {\r
-    <LibraryClasses>\r
-      PcdLib|MdePkg/Library/PeiPcdLib/PeiPcdLib.inf\r
-  }\r
+  OvmfPkg/SmmAccess/SmmAccessPei.inf\r

 !endif\r
 !endif\r

-  UefiCpuPkg/CpuMpPei/CpuMpPei.inf {\r
-    <LibraryClasses>\r
-      PcdLib|MdePkg/Library/PeiPcdLib/PeiPcdLib.inf\r
-  }\r
+  UefiCpuPkg/CpuMpPei/CpuMpPei.inf\r

 \r
 [Components.X64]\r
   #\r
 \r
 [Components.X64]\r
   #\r

diff --git a/OvmfPkg/OvmfPkgX64.dsc b/OvmfPkg/OvmfPkgX64.dsc
index f553a0a1674a8d34ad04b6aa95f41e1414d83953..61aaed761657eaa3032e7b246457bd16de845159 100644 (file)
--- a/OvmfPkg/OvmfPkgX64.dsc
+++ b/OvmfPkg/OvmfPkgX64.dsc
@@ -261,6 +261,7 @@
   CpuExceptionHandlerLib|UefiCpuPkg/Library/CpuExceptionHandlerLib/PeiCpuExceptionHandlerLib.inf\r
   MpInitLib|UefiCpuPkg/Library/MpInitLib/PeiMpInitLib.inf\r
   QemuFwCfgS3Lib|OvmfPkg/Library/QemuFwCfgS3Lib/PeiQemuFwCfgS3LibFwCfg.inf\r
   CpuExceptionHandlerLib|UefiCpuPkg/Library/CpuExceptionHandlerLib/PeiCpuExceptionHandlerLib.inf\r
   MpInitLib|UefiCpuPkg/Library/MpInitLib/PeiMpInitLib.inf\r
   QemuFwCfgS3Lib|OvmfPkg/Library/QemuFwCfgS3Lib/PeiQemuFwCfgS3LibFwCfg.inf\r

+  PcdLib|MdePkg/Library/PeiPcdLib/PeiPcdLib.inf\r

 \r
 [LibraryClasses.common.DXE_CORE]\r
   HobLib|MdePkg/Library/DxeCoreHobLib/DxeCoreHobLib.inf\r
 \r
 [LibraryClasses.common.DXE_CORE]\r
   HobLib|MdePkg/Library/DxeCoreHobLib/DxeCoreHobLib.inf\r


@@ -574,32 +575,19 @@
     <LibraryClasses>\r
       PcdLib|MdePkg/Library/BasePcdLibNull/BasePcdLibNull.inf\r
   }\r
     <LibraryClasses>\r
       PcdLib|MdePkg/Library/BasePcdLibNull/BasePcdLibNull.inf\r
   }\r

-  MdeModulePkg/Core/DxeIplPeim/DxeIpl.inf {\r
-    <LibraryClasses>\r
-      PcdLib|MdePkg/Library/PeiPcdLib/PeiPcdLib.inf\r
-  }\r
+  MdeModulePkg/Core/DxeIplPeim/DxeIpl.inf\r

 \r
 \r

-  OvmfPkg/PlatformPei/PlatformPei.inf {\r
-    <LibraryClasses>\r
-      PcdLib|MdePkg/Library/PeiPcdLib/PeiPcdLib.inf\r
-  }\r
+  OvmfPkg/PlatformPei/PlatformPei.inf\r

   UefiCpuPkg/Universal/Acpi/S3Resume2Pei/S3Resume2Pei.inf {\r
     <LibraryClasses>\r
   UefiCpuPkg/Universal/Acpi/S3Resume2Pei/S3Resume2Pei.inf {\r
     <LibraryClasses>\r

-      PcdLib|MdePkg/Library/PeiPcdLib/PeiPcdLib.inf\r

 !if $(SMM_REQUIRE) == TRUE\r
       LockBoxLib|MdeModulePkg/Library/SmmLockBoxLib/SmmLockBoxPeiLib.inf\r
 !endif\r
   }\r
 !if $(SMM_REQUIRE) == TRUE\r
 !if $(SMM_REQUIRE) == TRUE\r
       LockBoxLib|MdeModulePkg/Library/SmmLockBoxLib/SmmLockBoxPeiLib.inf\r
 !endif\r
   }\r
 !if $(SMM_REQUIRE) == TRUE\r

-  OvmfPkg/SmmAccess/SmmAccessPei.inf {\r
-    <LibraryClasses>\r
-      PcdLib|MdePkg/Library/PeiPcdLib/PeiPcdLib.inf\r
-  }\r
+  OvmfPkg/SmmAccess/SmmAccessPei.inf\r

 !endif\r
 !endif\r

-  UefiCpuPkg/CpuMpPei/CpuMpPei.inf {\r
-    <LibraryClasses>\r
-      PcdLib|MdePkg/Library/PeiPcdLib/PeiPcdLib.inf\r
-  }\r
+  UefiCpuPkg/CpuMpPei/CpuMpPei.inf\r

 \r
   #\r
   # DXE Phase modules\r
 \r
   #\r
   # DXE Phase modules\r