DuetPkg: Remove use of IntelFrameworkModulePkg legacy libs

LzmaCustomDecompressLib and PeiDxeDebugLibReportStatusCode were copied
from IntelFrameworkModulePkg to MdeModulePkg, but the originals were
kept for compatibility.

Since the libraries are identical, move DuetPkg to use the MdeModulePkg
versions instead.

Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Leif Lindholm <leif.lindholm@linaro.org>
Reviewed-by: Ruiyu Ni <ruiyu.ni@intel.com>

diff --git a/DuetPkg/DuetPkgIa32.dsc b/DuetPkg/DuetPkgIa32.dsc
index 3b59343154178425f443522ad6ad2a0b50733e71..7dd963b2359629a5417b451ca25343c59c949908 100644 (file)
--- a/DuetPkg/DuetPkgIa32.dsc
+++ b/DuetPkg/DuetPkgIa32.dsc
@@ -178,7 +178,7 @@
       gEfiMdePkgTokenSpaceGuid.PcdDebugPropertyMask|0x2F\r
       gEfiMdePkgTokenSpaceGuid.PcdDebugPrintErrorLevel|0x80000042\r
     <LibraryClasses>\r
-      DebugLib|IntelFrameworkModulePkg/Library/PeiDxeDebugLibReportStatusCode/PeiDxeDebugLibReportStatusCode.inf\r
+      DebugLib|MdeModulePkg/Library/PeiDxeDebugLibReportStatusCode/PeiDxeDebugLibReportStatusCode.inf\r
       ReportStatusCodeLib|DuetPkg/Library/DxeCoreReportStatusCodeLibFromHob/DxeCoreReportStatusCodeLibFromHob.inf\r
   }\r
 \r
@@ -211,7 +211,7 @@
   DuetPkg/EfiLdr/EfiLdr.inf {\r
     <LibraryClasses>\r
       DebugLib|MdePkg/Library/BaseDebugLibNull/BaseDebugLibNull.inf\r
-      NULL|IntelFrameworkModulePkg/Library/LzmaCustomDecompressLib/LzmaCustomDecompressLib.inf\r
+      NULL|MdeModulePkg/Library/LzmaCustomDecompressLib/LzmaCustomDecompressLib.inf\r
   }\r
   IntelFrameworkModulePkg/Universal/BdsDxe/BdsDxe.inf {\r
     <LibraryClasses>\r

diff --git a/DuetPkg/DuetPkgX64.dsc b/DuetPkg/DuetPkgX64.dsc
index c23354a5aefb4a2c85d813ff656cd71b32d6c2c8..1b08a95821877dab3f121e60b5763eeef99f683b 100644 (file)
--- a/DuetPkg/DuetPkgX64.dsc
+++ b/DuetPkg/DuetPkgX64.dsc
@@ -179,7 +179,7 @@
       gEfiMdePkgTokenSpaceGuid.PcdDebugPropertyMask|0x2F\r
       gEfiMdePkgTokenSpaceGuid.PcdDebugPrintErrorLevel|0x80000042\r
     <LibraryClasses>\r
-      DebugLib|IntelFrameworkModulePkg/Library/PeiDxeDebugLibReportStatusCode/PeiDxeDebugLibReportStatusCode.inf\r
+      DebugLib|MdeModulePkg/Library/PeiDxeDebugLibReportStatusCode/PeiDxeDebugLibReportStatusCode.inf\r
       ReportStatusCodeLib|DuetPkg/Library/DxeCoreReportStatusCodeLibFromHob/DxeCoreReportStatusCodeLibFromHob.inf\r
   }\r
 \r
@@ -212,7 +212,7 @@
   DuetPkg/EfiLdr/EfiLdr.inf {\r
     <LibraryClasses>\r
       DebugLib|MdePkg/Library/BaseDebugLibNull/BaseDebugLibNull.inf\r
-      NULL|IntelFrameworkModulePkg/Library/LzmaCustomDecompressLib/LzmaCustomDecompressLib.inf\r
+      NULL|MdeModulePkg/Library/LzmaCustomDecompressLib/LzmaCustomDecompressLib.inf\r
   }\r
   IntelFrameworkModulePkg/Universal/BdsDxe/BdsDxe.inf {\r
     <LibraryClasses>\r