| Message ID | 20161130172028.1430-1-leif.lindholm@linaro.org |
|---|---|
| State | New |
| Headers | show |
On 11/30/16 18:20, Leif Lindholm wrote: > LzmaCustomDecompressLib and PeiDxeDebugLibReportStatusCode were copied > from IntelFrameworkModulePkg to MdeModulePkg, but the originals were > kept for compatibility. > > Nevertheless, new code should be using the MdeModulePkg versions, so > change all references in in-tree platforms. > > Contributed-under: TianoCore Contribution Agreement 1.0 > Signed-off-by: Leif Lindholm <leif.lindholm@linaro.org> > --- > BeagleBoardPkg/BeagleBoardPkg.dsc | 4 ++-- > DuetPkg/DuetPkgIa32.dsc | 4 ++-- > DuetPkg/DuetPkgX64.dsc | 4 ++-- > EmbeddedPkg/EmbeddedPkg.dsc | 2 +- > EmulatorPkg/EmulatorPkg.dsc | 4 ++-- > IntelFrameworkModulePkg/IntelFrameworkModulePkg.dsc | 6 +++--- > OvmfPkg/OvmfPkgIa32.dsc | 4 ++-- > OvmfPkg/OvmfPkgIa32X64.dsc | 4 ++-- > OvmfPkg/OvmfPkgX64.dsc | 4 ++-- > QuarkSocPkg/QuarkSocPkg.dsc | 2 +- > Vlv2TbltDevicePkg/PlatformPkgGccX64.dsc | 4 ++-- > Vlv2TbltDevicePkg/PlatformPkgIA32.dsc | 6 +++--- > Vlv2TbltDevicePkg/PlatformPkgX64.dsc | 6 +++--- > 13 files changed, 27 insertions(+), 27 deletions(-) [snip] > diff --git a/OvmfPkg/OvmfPkgIa32.dsc b/OvmfPkg/OvmfPkgIa32.dsc > index d913030..81f7521 100644 > --- a/OvmfPkg/OvmfPkgIa32.dsc > +++ b/OvmfPkg/OvmfPkgIa32.dsc > @@ -505,7 +505,7 @@ > # > OvmfPkg/Sec/SecMain.inf { > <LibraryClasses> > - NULL|IntelFrameworkModulePkg/Library/LzmaCustomDecompressLib/LzmaCustomDecompressLib.inf > + NULL|MdeModulePkg/Library/LzmaCustomDecompressLib/LzmaCustomDecompressLib.inf > } > > # > @@ -550,7 +550,7 @@ > # > MdeModulePkg/Core/Dxe/DxeMain.inf { > <LibraryClasses> > - NULL|IntelFrameworkModulePkg/Library/LzmaCustomDecompressLib/LzmaCustomDecompressLib.inf > + NULL|MdeModulePkg/Library/LzmaCustomDecompressLib/LzmaCustomDecompressLib.inf > DevicePathLib|MdePkg/Library/UefiDevicePathLib/UefiDevicePathLib.inf > } > > diff --git a/OvmfPkg/OvmfPkgIa32X64.dsc b/OvmfPkg/OvmfPkgIa32X64.dsc > index 8143ea9..f7855b6 100644 > --- a/OvmfPkg/OvmfPkgIa32X64.dsc > +++ b/OvmfPkg/OvmfPkgIa32X64.dsc > @@ -513,7 +513,7 @@ > # > OvmfPkg/Sec/SecMain.inf { > <LibraryClasses> > - NULL|IntelFrameworkModulePkg/Library/LzmaCustomDecompressLib/LzmaCustomDecompressLib.inf > + NULL|MdeModulePkg/Library/LzmaCustomDecompressLib/LzmaCustomDecompressLib.inf > } > > # > @@ -559,7 +559,7 @@ > # > MdeModulePkg/Core/Dxe/DxeMain.inf { > <LibraryClasses> > - NULL|IntelFrameworkModulePkg/Library/LzmaCustomDecompressLib/LzmaCustomDecompressLib.inf > + NULL|MdeModulePkg/Library/LzmaCustomDecompressLib/LzmaCustomDecompressLib.inf > DevicePathLib|MdePkg/Library/UefiDevicePathLib/UefiDevicePathLib.inf > } > > diff --git a/OvmfPkg/OvmfPkgX64.dsc b/OvmfPkg/OvmfPkgX64.dsc > index d48d603..e933a41 100644 > --- a/OvmfPkg/OvmfPkgX64.dsc > +++ b/OvmfPkg/OvmfPkgX64.dsc > @@ -512,7 +512,7 @@ > # > OvmfPkg/Sec/SecMain.inf { > <LibraryClasses> > - NULL|IntelFrameworkModulePkg/Library/LzmaCustomDecompressLib/LzmaCustomDecompressLib.inf > + NULL|MdeModulePkg/Library/LzmaCustomDecompressLib/LzmaCustomDecompressLib.inf > } > > # > @@ -557,7 +557,7 @@ > # > MdeModulePkg/Core/Dxe/DxeMain.inf { > <LibraryClasses> > - NULL|IntelFrameworkModulePkg/Library/LzmaCustomDecompressLib/LzmaCustomDecompressLib.inf > + NULL|MdeModulePkg/Library/LzmaCustomDecompressLib/LzmaCustomDecompressLib.inf > DevicePathLib|MdePkg/Library/UefiDevicePathLib/UefiDevicePathLib.inf > } > [snip] I diffed the two library instances (the directories) recursively, and they are identical. That's actually too much of a match for my taste; the copy under MdeModulePkg should have at least received a different FILE_GUID. Anyway, the change looks safe. If you split out the OvmfPkg patch (please do that in the non-RFC version), you can add my Reviewed-by: Laszlo Ersek <lersek@redhat.com> Thanks! Laszlo _______________________________________________ edk2-devel mailing list edk2-devel@lists.01.org https://lists.01.org/mailman/listinfo/edk2-devel
On 2016/12/1 1:20, Leif Lindholm wrote: > LzmaCustomDecompressLib and PeiDxeDebugLibReportStatusCode were copied > from IntelFrameworkModulePkg to MdeModulePkg, but the originals were > kept for compatibility. > > Nevertheless, new code should be using the MdeModulePkg versions, so > change all references in in-tree platforms. > > Contributed-under: TianoCore Contribution Agreement 1.0 > Signed-off-by: Leif Lindholm <leif.lindholm@linaro.org> > --- > BeagleBoardPkg/BeagleBoardPkg.dsc | 4 ++-- > DuetPkg/DuetPkgIa32.dsc | 4 ++-- > DuetPkg/DuetPkgX64.dsc | 4 ++-- > EmbeddedPkg/EmbeddedPkg.dsc | 2 +- > EmulatorPkg/EmulatorPkg.dsc | 4 ++-- > IntelFrameworkModulePkg/IntelFrameworkModulePkg.dsc | 6 +++--- The change to IntelFrameworkModulePkg.dsc should be not needed as the package dsc is for package build to cover the libraries and modules in that package. Other changes look good to me. Thanks, Star > OvmfPkg/OvmfPkgIa32.dsc | 4 ++-- > OvmfPkg/OvmfPkgIa32X64.dsc | 4 ++-- > OvmfPkg/OvmfPkgX64.dsc | 4 ++-- > QuarkSocPkg/QuarkSocPkg.dsc | 2 +- > Vlv2TbltDevicePkg/PlatformPkgGccX64.dsc | 4 ++-- > Vlv2TbltDevicePkg/PlatformPkgIA32.dsc | 6 +++--- > Vlv2TbltDevicePkg/PlatformPkgX64.dsc | 6 +++--- > 13 files changed, 27 insertions(+), 27 deletions(-) > > diff --git a/BeagleBoardPkg/BeagleBoardPkg.dsc b/BeagleBoardPkg/BeagleBoardPkg.dsc > index f40095a..b074b92 100644 > --- a/BeagleBoardPkg/BeagleBoardPkg.dsc > +++ b/BeagleBoardPkg/BeagleBoardPkg.dsc > @@ -141,7 +141,7 @@ > > [LibraryClasses.common.SEC] > PcdLib|MdePkg/Library/BasePcdLibNull/BasePcdLibNull.inf > - ReportStatusCodeLib|IntelFrameworkModulePkg/Library/PeiDxeDebugLibReportStatusCode/PeiDxeDebugLibReportStatusCode.inf > + ReportStatusCodeLib|MdeModulePkg/Library/PeiDxeDebugLibReportStatusCode/PeiDxeDebugLibReportStatusCode.inf > UefiDecompressLib|MdePkg/Library/BaseUefiDecompressLib/BaseUefiDecompressLib.inf > ExtractGuidedSectionLib|EmbeddedPkg/Library/PrePiExtractGuidedSectionLib/PrePiExtractGuidedSectionLib.inf > LzmaDecompressLib|MdeModulePkg/Library/LzmaCustomDecompressLib/LzmaCustomDecompressLib.inf > @@ -163,7 +163,7 @@ > > [LibraryClasses.common.PEI_CORE] > PcdLib|MdePkg/Library/BasePcdLibNull/BasePcdLibNull.inf > - ReportStatusCodeLib|IntelFrameworkModulePkg/Library/PeiDxeDebugLibReportStatusCode/PeiDxeDebugLibReportStatusCode.inf > + ReportStatusCodeLib|MdeModulePkg/Library/PeiDxeDebugLibReportStatusCode/PeiDxeDebugLibReportStatusCode.inf > > [LibraryClasses.common.DXE_CORE] > HobLib|MdePkg/Library/DxeCoreHobLib/DxeCoreHobLib.inf > diff --git a/DuetPkg/DuetPkgIa32.dsc b/DuetPkg/DuetPkgIa32.dsc > index 3b59343..7dd963b 100644 > --- a/DuetPkg/DuetPkgIa32.dsc > +++ b/DuetPkg/DuetPkgIa32.dsc > @@ -178,7 +178,7 @@ > gEfiMdePkgTokenSpaceGuid.PcdDebugPropertyMask|0x2F > gEfiMdePkgTokenSpaceGuid.PcdDebugPrintErrorLevel|0x80000042 > <LibraryClasses> > - DebugLib|IntelFrameworkModulePkg/Library/PeiDxeDebugLibReportStatusCode/PeiDxeDebugLibReportStatusCode.inf > + DebugLib|MdeModulePkg/Library/PeiDxeDebugLibReportStatusCode/PeiDxeDebugLibReportStatusCode.inf > ReportStatusCodeLib|DuetPkg/Library/DxeCoreReportStatusCodeLibFromHob/DxeCoreReportStatusCodeLibFromHob.inf > } > > @@ -211,7 +211,7 @@ > DuetPkg/EfiLdr/EfiLdr.inf { > <LibraryClasses> > DebugLib|MdePkg/Library/BaseDebugLibNull/BaseDebugLibNull.inf > - NULL|IntelFrameworkModulePkg/Library/LzmaCustomDecompressLib/LzmaCustomDecompressLib.inf > + NULL|MdeModulePkg/Library/LzmaCustomDecompressLib/LzmaCustomDecompressLib.inf > } > IntelFrameworkModulePkg/Universal/BdsDxe/BdsDxe.inf { > <LibraryClasses> > diff --git a/DuetPkg/DuetPkgX64.dsc b/DuetPkg/DuetPkgX64.dsc > index c23354a..1b08a95 100644 > --- a/DuetPkg/DuetPkgX64.dsc > +++ b/DuetPkg/DuetPkgX64.dsc > @@ -179,7 +179,7 @@ > gEfiMdePkgTokenSpaceGuid.PcdDebugPropertyMask|0x2F > gEfiMdePkgTokenSpaceGuid.PcdDebugPrintErrorLevel|0x80000042 > <LibraryClasses> > - DebugLib|IntelFrameworkModulePkg/Library/PeiDxeDebugLibReportStatusCode/PeiDxeDebugLibReportStatusCode.inf > + DebugLib|MdeModulePkg/Library/PeiDxeDebugLibReportStatusCode/PeiDxeDebugLibReportStatusCode.inf > ReportStatusCodeLib|DuetPkg/Library/DxeCoreReportStatusCodeLibFromHob/DxeCoreReportStatusCodeLibFromHob.inf > } > > @@ -212,7 +212,7 @@ > DuetPkg/EfiLdr/EfiLdr.inf { > <LibraryClasses> > DebugLib|MdePkg/Library/BaseDebugLibNull/BaseDebugLibNull.inf > - NULL|IntelFrameworkModulePkg/Library/LzmaCustomDecompressLib/LzmaCustomDecompressLib.inf > + NULL|MdeModulePkg/Library/LzmaCustomDecompressLib/LzmaCustomDecompressLib.inf > } > IntelFrameworkModulePkg/Universal/BdsDxe/BdsDxe.inf { > <LibraryClasses> > diff --git a/EmbeddedPkg/EmbeddedPkg.dsc b/EmbeddedPkg/EmbeddedPkg.dsc > index eb7af80..ba4f1ea 100644 > --- a/EmbeddedPkg/EmbeddedPkg.dsc > +++ b/EmbeddedPkg/EmbeddedPkg.dsc > @@ -60,7 +60,7 @@ > UefiDecompressLib|MdePkg/Library/BaseUefiDecompressLib/BaseUefiDecompressLib.inf > EfiFileLib|EmbeddedPkg/Library/EfiFileLib/EfiFileLib.inf > > - ReportStatusCodeLib|IntelFrameworkModulePkg/Library/PeiDxeDebugLibReportStatusCode/PeiDxeDebugLibReportStatusCode.inf > + ReportStatusCodeLib|MdeModulePkg/Library/PeiDxeDebugLibReportStatusCode/PeiDxeDebugLibReportStatusCode.inf > > PeCoffGetEntryPointLib|MdePkg/Library/BasePeCoffGetEntryPointLib/BasePeCoffGetEntryPointLib.inf > PeCoffLib|MdePkg/Library/BasePeCoffLib/BasePeCoffLib.inf > diff --git a/EmulatorPkg/EmulatorPkg.dsc b/EmulatorPkg/EmulatorPkg.dsc > index f516adf..b96b9f2 100644 > --- a/EmulatorPkg/EmulatorPkg.dsc > +++ b/EmulatorPkg/EmulatorPkg.dsc > @@ -101,7 +101,7 @@ > PerformanceLib|MdePkg/Library/BasePerformanceLibNull/BasePerformanceLibNull.inf > DebugAgentLib|MdeModulePkg/Library/DebugAgentLibNull/DebugAgentLibNull.inf > PeiServicesTablePointerLib|EmulatorPkg/Library/PeiServicesTablePointerLibMagicPage/PeiServicesTablePointerLibMagicPage.inf > - DebugLib|IntelFrameworkModulePkg/Library/PeiDxeDebugLibReportStatusCode/PeiDxeDebugLibReportStatusCode.inf > + DebugLib|MdeModulePkg/Library/PeiDxeDebugLibReportStatusCode/PeiDxeDebugLibReportStatusCode.inf > LockBoxLib|MdeModulePkg/Library/LockBoxNullLib/LockBoxNullLib.inf > CpuExceptionHandlerLib|MdeModulePkg/Library/CpuExceptionHandlerLibNull/CpuExceptionHandlerLibNull.inf > TpmMeasurementLib|MdeModulePkg/Library/TpmMeasurementLibNull/TpmMeasurementLibNull.inf > @@ -281,7 +281,7 @@ > SerialPortLib|EmulatorPkg/Library/DxeEmuStdErrSerialPortLib/DxeEmuStdErrSerialPortLib.inf > DxeEmuLib|EmulatorPkg/Library/DxeEmuLib/DxeEmuLib.inf > NULL|MdeModulePkg/Library/DxeCrc32GuidedSectionExtractLib/DxeCrc32GuidedSectionExtractLib.inf > - NULL|IntelFrameworkModulePkg/Library/LzmaCustomDecompressLib/LzmaCustomDecompressLib.inf > + NULL|MdeModulePkg/Library/LzmaCustomDecompressLib/LzmaCustomDecompressLib.inf > } > MdeModulePkg/Universal/PCD/Dxe/Pcd.inf { > <LibraryClasses> > diff --git a/IntelFrameworkModulePkg/IntelFrameworkModulePkg.dsc b/IntelFrameworkModulePkg/IntelFrameworkModulePkg.dsc > index a9a01aa..2df2dec 100644 > --- a/IntelFrameworkModulePkg/IntelFrameworkModulePkg.dsc > +++ b/IntelFrameworkModulePkg/IntelFrameworkModulePkg.dsc > @@ -130,12 +130,12 @@ > > [Components] > IntelFrameworkModulePkg/Library/BaseUefiTianoCustomDecompressLib/BaseUefiTianoCustomDecompressLib.inf > - IntelFrameworkModulePkg/Library/LzmaCustomDecompressLib/LzmaCustomDecompressLib.inf > + MdeModulePkg/Library/LzmaCustomDecompressLib/LzmaCustomDecompressLib.inf > IntelFrameworkModulePkg/Library/PeiS3Lib/PeiS3Lib.inf > IntelFrameworkModulePkg/Library/PeiRecoveryLib/PeiRecoveryLib.inf > IntelFrameworkModulePkg/Library/DxeReportStatusCodeLibFramework/DxeReportStatusCodeLib.inf > IntelFrameworkModulePkg/Library/SmmRuntimeDxeReportStatusCodeLibFramework/SmmRuntimeDxeReportStatusCodeLibFramework.inf > - IntelFrameworkModulePkg/Library/PeiDxeDebugLibReportStatusCode/PeiDxeDebugLibReportStatusCode.inf > + MdeModulePkg/Library/PeiDxeDebugLibReportStatusCode/PeiDxeDebugLibReportStatusCode.inf > IntelFrameworkModulePkg/Library/PlatformBdsLibNull/PlatformBdsLibNull.inf > IntelFrameworkModulePkg/Library/GenericBdsLib/GenericBdsLib.inf > IntelFrameworkModulePkg/Library/DxeCapsuleLib/DxeCapsuleLib.inf > @@ -172,7 +172,7 @@ > > [Components.IA32,Components.X64] > IntelFrameworkModulePkg/Universal/Acpi/AcpiS3SaveDxe/AcpiS3SaveDxe.inf > - IntelFrameworkModulePkg/Library/LzmaCustomDecompressLib/LzmaArchCustomDecompressLib.inf > + MdeModulePkg/Library/LzmaCustomDecompressLib/LzmaArchCustomDecompressLib.inf > > [Components.IA32,Components.X64,Components.IPF] > IntelFrameworkModulePkg/Csm/LegacyBiosDxe/LegacyBiosDxe.inf > diff --git a/OvmfPkg/OvmfPkgIa32.dsc b/OvmfPkg/OvmfPkgIa32.dsc > index d913030..81f7521 100644 > --- a/OvmfPkg/OvmfPkgIa32.dsc > +++ b/OvmfPkg/OvmfPkgIa32.dsc > @@ -505,7 +505,7 @@ > # > OvmfPkg/Sec/SecMain.inf { > <LibraryClasses> > - NULL|IntelFrameworkModulePkg/Library/LzmaCustomDecompressLib/LzmaCustomDecompressLib.inf > + NULL|MdeModulePkg/Library/LzmaCustomDecompressLib/LzmaCustomDecompressLib.inf > } > > # > @@ -550,7 +550,7 @@ > # > MdeModulePkg/Core/Dxe/DxeMain.inf { > <LibraryClasses> > - NULL|IntelFrameworkModulePkg/Library/LzmaCustomDecompressLib/LzmaCustomDecompressLib.inf > + NULL|MdeModulePkg/Library/LzmaCustomDecompressLib/LzmaCustomDecompressLib.inf > DevicePathLib|MdePkg/Library/UefiDevicePathLib/UefiDevicePathLib.inf > } > > diff --git a/OvmfPkg/OvmfPkgIa32X64.dsc b/OvmfPkg/OvmfPkgIa32X64.dsc > index 8143ea9..f7855b6 100644 > --- a/OvmfPkg/OvmfPkgIa32X64.dsc > +++ b/OvmfPkg/OvmfPkgIa32X64.dsc > @@ -513,7 +513,7 @@ > # > OvmfPkg/Sec/SecMain.inf { > <LibraryClasses> > - NULL|IntelFrameworkModulePkg/Library/LzmaCustomDecompressLib/LzmaCustomDecompressLib.inf > + NULL|MdeModulePkg/Library/LzmaCustomDecompressLib/LzmaCustomDecompressLib.inf > } > > # > @@ -559,7 +559,7 @@ > # > MdeModulePkg/Core/Dxe/DxeMain.inf { > <LibraryClasses> > - NULL|IntelFrameworkModulePkg/Library/LzmaCustomDecompressLib/LzmaCustomDecompressLib.inf > + NULL|MdeModulePkg/Library/LzmaCustomDecompressLib/LzmaCustomDecompressLib.inf > DevicePathLib|MdePkg/Library/UefiDevicePathLib/UefiDevicePathLib.inf > } > > diff --git a/OvmfPkg/OvmfPkgX64.dsc b/OvmfPkg/OvmfPkgX64.dsc > index d48d603..e933a41 100644 > --- a/OvmfPkg/OvmfPkgX64.dsc > +++ b/OvmfPkg/OvmfPkgX64.dsc > @@ -512,7 +512,7 @@ > # > OvmfPkg/Sec/SecMain.inf { > <LibraryClasses> > - NULL|IntelFrameworkModulePkg/Library/LzmaCustomDecompressLib/LzmaCustomDecompressLib.inf > + NULL|MdeModulePkg/Library/LzmaCustomDecompressLib/LzmaCustomDecompressLib.inf > } > > # > @@ -557,7 +557,7 @@ > # > MdeModulePkg/Core/Dxe/DxeMain.inf { > <LibraryClasses> > - NULL|IntelFrameworkModulePkg/Library/LzmaCustomDecompressLib/LzmaCustomDecompressLib.inf > + NULL|MdeModulePkg/Library/LzmaCustomDecompressLib/LzmaCustomDecompressLib.inf > DevicePathLib|MdePkg/Library/UefiDevicePathLib/UefiDevicePathLib.inf > } > > diff --git a/QuarkSocPkg/QuarkSocPkg.dsc b/QuarkSocPkg/QuarkSocPkg.dsc > index 42bb5bb..9e37a0b 100644 > --- a/QuarkSocPkg/QuarkSocPkg.dsc > +++ b/QuarkSocPkg/QuarkSocPkg.dsc > @@ -116,7 +116,7 @@ > # > # Misc > # > - DebugLib|IntelFrameworkModulePkg/Library/PeiDxeDebugLibReportStatusCode/PeiDxeDebugLibReportStatusCode.inf > + DebugLib|MdeModulePkg/Library/PeiDxeDebugLibReportStatusCode/PeiDxeDebugLibReportStatusCode.inf > DebugPrintErrorLevelLib|MdePkg/Library/BaseDebugPrintErrorLevelLib/BaseDebugPrintErrorLevelLib.inf > PerformanceLib|MdePkg/Library/BasePerformanceLibNull/BasePerformanceLibNull.inf > PcdLib|MdePkg/Library/BasePcdLibNull/BasePcdLibNull.inf > diff --git a/Vlv2TbltDevicePkg/PlatformPkgGccX64.dsc b/Vlv2TbltDevicePkg/PlatformPkgGccX64.dsc > index c3dc25f..9da6c97 100644 > --- a/Vlv2TbltDevicePkg/PlatformPkgGccX64.dsc > +++ b/Vlv2TbltDevicePkg/PlatformPkgGccX64.dsc > @@ -1064,7 +1064,7 @@ $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)$(TARGET)/IA32/fTPMInitPeim.inf > MdeModulePkg/Core/DxeIplPeim/DxeIpl.inf { > <LibraryClasses> > !if $(LZMA_ENABLE) == TRUE > - NULL|IntelFrameworkModulePkg/Library/LzmaCustomDecompressLib/LzmaCustomDecompressLib.inf > + NULL|MdeModulePkg/Library/LzmaCustomDecompressLib/LzmaCustomDecompressLib.inf > !endif > } > > @@ -1121,7 +1121,7 @@ $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)$(TARGET)/IA32/fTPMInitPeim.inf > NULL|MdeModulePkg/Library/DxeCrc32GuidedSectionExtractLib/DxeCrc32GuidedSectionExtractLib.inf > !endif > !if $(LZMA_ENABLE) == TRUE > - NULL|IntelFrameworkModulePkg/Library/LzmaCustomDecompressLib/LzmaCustomDecompressLib.inf > + NULL|MdeModulePkg/Library/LzmaCustomDecompressLib/LzmaCustomDecompressLib.inf > !endif > !if $(TARGET) != RELEASE > DebugLib|MdePkg/Library/BaseDebugLibSerialPort/BaseDebugLibSerialPort.inf > diff --git a/Vlv2TbltDevicePkg/PlatformPkgIA32.dsc b/Vlv2TbltDevicePkg/PlatformPkgIA32.dsc > index 3a5776a..556e4cf 100644 > --- a/Vlv2TbltDevicePkg/PlatformPkgIA32.dsc > +++ b/Vlv2TbltDevicePkg/PlatformPkgIA32.dsc > @@ -332,7 +332,7 @@ > DebugLib|MdePkg/Library/BaseDebugLibNull/BaseDebugLibNull.inf > SerialPortLib|MdePkg/Library/BaseSerialPortLibNull/BaseSerialPortLibNull.inf > !else > - DebugLib|IntelFrameworkModulePkg/Library/PeiDxeDebugLibReportStatusCode/PeiDxeDebugLibReportStatusCode.inf > + DebugLib|MdeModulePkg/Library/PeiDxeDebugLibReportStatusCode/PeiDxeDebugLibReportStatusCode.inf > SerialPortLib|$(PLATFORM_PACKAGE)/Library/SerialPortLib/SerialPortLib.inf > !endif > > @@ -1058,7 +1058,7 @@ $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)$(TARGET)/IA32/fTPMInitPeim.inf > MdeModulePkg/Core/DxeIplPeim/DxeIpl.inf { > <LibraryClasses> > !if $(LZMA_ENABLE) == TRUE > - NULL|IntelFrameworkModulePkg/Library/LzmaCustomDecompressLib/LzmaCustomDecompressLib.inf > + NULL|MdeModulePkg/Library/LzmaCustomDecompressLib/LzmaCustomDecompressLib.inf > !endif > } > > @@ -1115,7 +1115,7 @@ $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)$(TARGET)/IA32/fTPMInitPeim.inf > NULL|MdeModulePkg/Library/DxeCrc32GuidedSectionExtractLib/DxeCrc32GuidedSectionExtractLib.inf > !endif > !if $(LZMA_ENABLE) == TRUE > - NULL|IntelFrameworkModulePkg/Library/LzmaCustomDecompressLib/LzmaCustomDecompressLib.inf > + NULL|MdeModulePkg/Library/LzmaCustomDecompressLib/LzmaCustomDecompressLib.inf > !endif > !if $(TARGET) != RELEASE > DebugLib|MdePkg/Library/BaseDebugLibSerialPort/BaseDebugLibSerialPort.inf > diff --git a/Vlv2TbltDevicePkg/PlatformPkgX64.dsc b/Vlv2TbltDevicePkg/PlatformPkgX64.dsc > index 83cbb0a..4f08ad4 100644 > --- a/Vlv2TbltDevicePkg/PlatformPkgX64.dsc > +++ b/Vlv2TbltDevicePkg/PlatformPkgX64.dsc > @@ -332,7 +332,7 @@ > DebugLib|MdePkg/Library/BaseDebugLibNull/BaseDebugLibNull.inf > SerialPortLib|MdePkg/Library/BaseSerialPortLibNull/BaseSerialPortLibNull.inf > !else > - DebugLib|IntelFrameworkModulePkg/Library/PeiDxeDebugLibReportStatusCode/PeiDxeDebugLibReportStatusCode.inf > + DebugLib|MdeModulePkg/Library/PeiDxeDebugLibReportStatusCode/PeiDxeDebugLibReportStatusCode.inf > SerialPortLib|$(PLATFORM_PACKAGE)/Library/SerialPortLib/SerialPortLib.inf > !endif > > @@ -1058,7 +1058,7 @@ $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)$(TARGET)/IA32/fTPMInitPeim.inf > MdeModulePkg/Core/DxeIplPeim/DxeIpl.inf { > <LibraryClasses> > !if $(LZMA_ENABLE) == TRUE > - NULL|IntelFrameworkModulePkg/Library/LzmaCustomDecompressLib/LzmaCustomDecompressLib.inf > + NULL|MdeModulePkg/Library/LzmaCustomDecompressLib/LzmaCustomDecompressLib.inf > !endif > } > > @@ -1115,7 +1115,7 @@ $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)$(TARGET)/IA32/fTPMInitPeim.inf > NULL|MdeModulePkg/Library/DxeCrc32GuidedSectionExtractLib/DxeCrc32GuidedSectionExtractLib.inf > !endif > !if $(LZMA_ENABLE) == TRUE > - NULL|IntelFrameworkModulePkg/Library/LzmaCustomDecompressLib/LzmaCustomDecompressLib.inf > + NULL|MdeModulePkg/Library/LzmaCustomDecompressLib/LzmaCustomDecompressLib.inf > !endif > !if $(TARGET) != RELEASE > DebugLib|MdePkg/Library/BaseDebugLibSerialPort/BaseDebugLibSerialPort.inf > _______________________________________________ edk2-devel mailing list edk2-devel@lists.01.org https://lists.01.org/mailman/listinfo/edk2-devel
QuarkSocPkg changes Reviewed-by: Michael Kinney <michael.d.kinney@intel.com> Mike > -----Original Message----- > From: Leif Lindholm [mailto:leif.lindholm@linaro.org] > Sent: Wednesday, November 30, 2016 9:20 AM > To: edk2-devel@lists.01.org; Gao, Liming <liming.gao@intel.com> > Cc: Wu, Hao A <hao.a.wu@intel.com>; Tian, Feng <feng.tian@intel.com>; Zeng, Star > <star.zeng@intel.com>; Ni, Ruiyu <ruiyu.ni@intel.com>; Justen, Jordan L > <jordan.l.justen@intel.com>; Andrew Fish <afish@apple.com>; Fan, Jeff > <jeff.fan@intel.com>; Laszlo Ersek <lersek@redhat.com>; Kinney, Michael D > <michael.d.kinney@intel.com>; Steele, Kelly <kelly.steele@intel.com>; Wei, David > <david.wei@intel.com>; Guo, Mang <mang.guo@intel.com> > Subject: [RFC] Various: Remove EDK2 use of IntelFrameworkModulePkg legacy libs > > LzmaCustomDecompressLib and PeiDxeDebugLibReportStatusCode were copied > from IntelFrameworkModulePkg to MdeModulePkg, but the originals were > kept for compatibility. > > Nevertheless, new code should be using the MdeModulePkg versions, so > change all references in in-tree platforms. > > Contributed-under: TianoCore Contribution Agreement 1.0 > Signed-off-by: Leif Lindholm <leif.lindholm@linaro.org> > --- > BeagleBoardPkg/BeagleBoardPkg.dsc | 4 ++-- > DuetPkg/DuetPkgIa32.dsc | 4 ++-- > DuetPkg/DuetPkgX64.dsc | 4 ++-- > EmbeddedPkg/EmbeddedPkg.dsc | 2 +- > EmulatorPkg/EmulatorPkg.dsc | 4 ++-- > IntelFrameworkModulePkg/IntelFrameworkModulePkg.dsc | 6 +++--- > OvmfPkg/OvmfPkgIa32.dsc | 4 ++-- > OvmfPkg/OvmfPkgIa32X64.dsc | 4 ++-- > OvmfPkg/OvmfPkgX64.dsc | 4 ++-- > QuarkSocPkg/QuarkSocPkg.dsc | 2 +- > Vlv2TbltDevicePkg/PlatformPkgGccX64.dsc | 4 ++-- > Vlv2TbltDevicePkg/PlatformPkgIA32.dsc | 6 +++--- > Vlv2TbltDevicePkg/PlatformPkgX64.dsc | 6 +++--- > 13 files changed, 27 insertions(+), 27 deletions(-) > > diff --git a/BeagleBoardPkg/BeagleBoardPkg.dsc > b/BeagleBoardPkg/BeagleBoardPkg.dsc > index f40095a..b074b92 100644 > --- a/BeagleBoardPkg/BeagleBoardPkg.dsc > +++ b/BeagleBoardPkg/BeagleBoardPkg.dsc > @@ -141,7 +141,7 @@ > > [LibraryClasses.common.SEC] > PcdLib|MdePkg/Library/BasePcdLibNull/BasePcdLibNull.inf > - > ReportStatusCodeLib|IntelFrameworkModulePkg/Library/PeiDxeDebugLibReportStatusCod > e/PeiDxeDebugLibReportStatusCode.inf > + > ReportStatusCodeLib|MdeModulePkg/Library/PeiDxeDebugLibReportStatusCode/PeiDxeDeb > ugLibReportStatusCode.inf > > UefiDecompressLib|MdePkg/Library/BaseUefiDecompressLib/BaseUefiDecompressLib.inf > > ExtractGuidedSectionLib|EmbeddedPkg/Library/PrePiExtractGuidedSectionLib/PrePiExt > ractGuidedSectionLib.inf > > LzmaDecompressLib|MdeModulePkg/Library/LzmaCustomDecompressLib/LzmaCustomDecompre > ssLib.inf > @@ -163,7 +163,7 @@ > > [LibraryClasses.common.PEI_CORE] > PcdLib|MdePkg/Library/BasePcdLibNull/BasePcdLibNull.inf > - > ReportStatusCodeLib|IntelFrameworkModulePkg/Library/PeiDxeDebugLibReportStatusCod > e/PeiDxeDebugLibReportStatusCode.inf > + > ReportStatusCodeLib|MdeModulePkg/Library/PeiDxeDebugLibReportStatusCode/PeiDxeDeb > ugLibReportStatusCode.inf > > [LibraryClasses.common.DXE_CORE] > HobLib|MdePkg/Library/DxeCoreHobLib/DxeCoreHobLib.inf > diff --git a/DuetPkg/DuetPkgIa32.dsc b/DuetPkg/DuetPkgIa32.dsc > index 3b59343..7dd963b 100644 > --- a/DuetPkg/DuetPkgIa32.dsc > +++ b/DuetPkg/DuetPkgIa32.dsc > @@ -178,7 +178,7 @@ > gEfiMdePkgTokenSpaceGuid.PcdDebugPropertyMask|0x2F > gEfiMdePkgTokenSpaceGuid.PcdDebugPrintErrorLevel|0x80000042 > <LibraryClasses> > - > DebugLib|IntelFrameworkModulePkg/Library/PeiDxeDebugLibReportStatusCode/PeiDxeDeb > ugLibReportStatusCode.inf > + > DebugLib|MdeModulePkg/Library/PeiDxeDebugLibReportStatusCode/PeiDxeDebugLibReport > StatusCode.inf > > ReportStatusCodeLib|DuetPkg/Library/DxeCoreReportStatusCodeLibFromHob/DxeCoreRepo > rtStatusCodeLibFromHob.inf > } > > @@ -211,7 +211,7 @@ > DuetPkg/EfiLdr/EfiLdr.inf { > <LibraryClasses> > DebugLib|MdePkg/Library/BaseDebugLibNull/BaseDebugLibNull.inf > - > NULL|IntelFrameworkModulePkg/Library/LzmaCustomDecompressLib/LzmaCustomDecompress > Lib.inf > + > NULL|MdeModulePkg/Library/LzmaCustomDecompressLib/LzmaCustomDecompressLib.inf > } > IntelFrameworkModulePkg/Universal/BdsDxe/BdsDxe.inf { > <LibraryClasses> > diff --git a/DuetPkg/DuetPkgX64.dsc b/DuetPkg/DuetPkgX64.dsc > index c23354a..1b08a95 100644 > --- a/DuetPkg/DuetPkgX64.dsc > +++ b/DuetPkg/DuetPkgX64.dsc > @@ -179,7 +179,7 @@ > gEfiMdePkgTokenSpaceGuid.PcdDebugPropertyMask|0x2F > gEfiMdePkgTokenSpaceGuid.PcdDebugPrintErrorLevel|0x80000042 > <LibraryClasses> > - > DebugLib|IntelFrameworkModulePkg/Library/PeiDxeDebugLibReportStatusCode/PeiDxeDeb > ugLibReportStatusCode.inf > + > DebugLib|MdeModulePkg/Library/PeiDxeDebugLibReportStatusCode/PeiDxeDebugLibReport > StatusCode.inf > > ReportStatusCodeLib|DuetPkg/Library/DxeCoreReportStatusCodeLibFromHob/DxeCoreRepo > rtStatusCodeLibFromHob.inf > } > > @@ -212,7 +212,7 @@ > DuetPkg/EfiLdr/EfiLdr.inf { > <LibraryClasses> > DebugLib|MdePkg/Library/BaseDebugLibNull/BaseDebugLibNull.inf > - > NULL|IntelFrameworkModulePkg/Library/LzmaCustomDecompressLib/LzmaCustomDecompress > Lib.inf > + > NULL|MdeModulePkg/Library/LzmaCustomDecompressLib/LzmaCustomDecompressLib.inf > } > IntelFrameworkModulePkg/Universal/BdsDxe/BdsDxe.inf { > <LibraryClasses> > diff --git a/EmbeddedPkg/EmbeddedPkg.dsc b/EmbeddedPkg/EmbeddedPkg.dsc > index eb7af80..ba4f1ea 100644 > --- a/EmbeddedPkg/EmbeddedPkg.dsc > +++ b/EmbeddedPkg/EmbeddedPkg.dsc > @@ -60,7 +60,7 @@ > > UefiDecompressLib|MdePkg/Library/BaseUefiDecompressLib/BaseUefiDecompressLib.inf > EfiFileLib|EmbeddedPkg/Library/EfiFileLib/EfiFileLib.inf > > - > ReportStatusCodeLib|IntelFrameworkModulePkg/Library/PeiDxeDebugLibReportStatusCod > e/PeiDxeDebugLibReportStatusCode.inf > + > ReportStatusCodeLib|MdeModulePkg/Library/PeiDxeDebugLibReportStatusCode/PeiDxeDeb > ugLibReportStatusCode.inf > > > PeCoffGetEntryPointLib|MdePkg/Library/BasePeCoffGetEntryPointLib/BasePeCoffGetEnt > ryPointLib.inf > PeCoffLib|MdePkg/Library/BasePeCoffLib/BasePeCoffLib.inf > diff --git a/EmulatorPkg/EmulatorPkg.dsc b/EmulatorPkg/EmulatorPkg.dsc > index f516adf..b96b9f2 100644 > --- a/EmulatorPkg/EmulatorPkg.dsc > +++ b/EmulatorPkg/EmulatorPkg.dsc > @@ -101,7 +101,7 @@ > > PerformanceLib|MdePkg/Library/BasePerformanceLibNull/BasePerformanceLibNull.inf > DebugAgentLib|MdeModulePkg/Library/DebugAgentLibNull/DebugAgentLibNull.inf > > PeiServicesTablePointerLib|EmulatorPkg/Library/PeiServicesTablePointerLibMagicPag > e/PeiServicesTablePointerLibMagicPage.inf > - > DebugLib|IntelFrameworkModulePkg/Library/PeiDxeDebugLibReportStatusCode/PeiDxeDeb > ugLibReportStatusCode.inf > + > DebugLib|MdeModulePkg/Library/PeiDxeDebugLibReportStatusCode/PeiDxeDebugLibReport > StatusCode.inf > LockBoxLib|MdeModulePkg/Library/LockBoxNullLib/LockBoxNullLib.inf > > CpuExceptionHandlerLib|MdeModulePkg/Library/CpuExceptionHandlerLibNull/CpuExcepti > onHandlerLibNull.inf > > TpmMeasurementLib|MdeModulePkg/Library/TpmMeasurementLibNull/TpmMeasurementLibNul > l.inf > @@ -281,7 +281,7 @@ > > SerialPortLib|EmulatorPkg/Library/DxeEmuStdErrSerialPortLib/DxeEmuStdErrSerialPor > tLib.inf > DxeEmuLib|EmulatorPkg/Library/DxeEmuLib/DxeEmuLib.inf > > NULL|MdeModulePkg/Library/DxeCrc32GuidedSectionExtractLib/DxeCrc32GuidedSectionEx > tractLib.inf > - > NULL|IntelFrameworkModulePkg/Library/LzmaCustomDecompressLib/LzmaCustomDecompress > Lib.inf > + > NULL|MdeModulePkg/Library/LzmaCustomDecompressLib/LzmaCustomDecompressLib.inf > } > MdeModulePkg/Universal/PCD/Dxe/Pcd.inf { > <LibraryClasses> > diff --git a/IntelFrameworkModulePkg/IntelFrameworkModulePkg.dsc > b/IntelFrameworkModulePkg/IntelFrameworkModulePkg.dsc > index a9a01aa..2df2dec 100644 > --- a/IntelFrameworkModulePkg/IntelFrameworkModulePkg.dsc > +++ b/IntelFrameworkModulePkg/IntelFrameworkModulePkg.dsc > @@ -130,12 +130,12 @@ > > [Components] > > IntelFrameworkModulePkg/Library/BaseUefiTianoCustomDecompressLib/BaseUefiTianoCus > tomDecompressLib.inf > - > IntelFrameworkModulePkg/Library/LzmaCustomDecompressLib/LzmaCustomDecompressLib.i > nf > + MdeModulePkg/Library/LzmaCustomDecompressLib/LzmaCustomDecompressLib.inf > IntelFrameworkModulePkg/Library/PeiS3Lib/PeiS3Lib.inf > IntelFrameworkModulePkg/Library/PeiRecoveryLib/PeiRecoveryLib.inf > > IntelFrameworkModulePkg/Library/DxeReportStatusCodeLibFramework/DxeReportStatusCo > deLib.inf > > IntelFrameworkModulePkg/Library/SmmRuntimeDxeReportStatusCodeLibFramework/SmmRunt > imeDxeReportStatusCodeLibFramework.inf > - > IntelFrameworkModulePkg/Library/PeiDxeDebugLibReportStatusCode/PeiDxeDebugLibRepo > rtStatusCode.inf > + > MdeModulePkg/Library/PeiDxeDebugLibReportStatusCode/PeiDxeDebugLibReportStatusCod > e.inf > IntelFrameworkModulePkg/Library/PlatformBdsLibNull/PlatformBdsLibNull.inf > IntelFrameworkModulePkg/Library/GenericBdsLib/GenericBdsLib.inf > IntelFrameworkModulePkg/Library/DxeCapsuleLib/DxeCapsuleLib.inf > @@ -172,7 +172,7 @@ > > [Components.IA32,Components.X64] > IntelFrameworkModulePkg/Universal/Acpi/AcpiS3SaveDxe/AcpiS3SaveDxe.inf > - > IntelFrameworkModulePkg/Library/LzmaCustomDecompressLib/LzmaArchCustomDecompressL > ib.inf > + MdeModulePkg/Library/LzmaCustomDecompressLib/LzmaArchCustomDecompressLib.inf > > [Components.IA32,Components.X64,Components.IPF] > IntelFrameworkModulePkg/Csm/LegacyBiosDxe/LegacyBiosDxe.inf > diff --git a/OvmfPkg/OvmfPkgIa32.dsc b/OvmfPkg/OvmfPkgIa32.dsc > index d913030..81f7521 100644 > --- a/OvmfPkg/OvmfPkgIa32.dsc > +++ b/OvmfPkg/OvmfPkgIa32.dsc > @@ -505,7 +505,7 @@ > # > OvmfPkg/Sec/SecMain.inf { > <LibraryClasses> > - > NULL|IntelFrameworkModulePkg/Library/LzmaCustomDecompressLib/LzmaCustomDecompress > Lib.inf > + > NULL|MdeModulePkg/Library/LzmaCustomDecompressLib/LzmaCustomDecompressLib.inf > } > > # > @@ -550,7 +550,7 @@ > # > MdeModulePkg/Core/Dxe/DxeMain.inf { > <LibraryClasses> > - > NULL|IntelFrameworkModulePkg/Library/LzmaCustomDecompressLib/LzmaCustomDecompress > Lib.inf > + > NULL|MdeModulePkg/Library/LzmaCustomDecompressLib/LzmaCustomDecompressLib.inf > DevicePathLib|MdePkg/Library/UefiDevicePathLib/UefiDevicePathLib.inf > } > > diff --git a/OvmfPkg/OvmfPkgIa32X64.dsc b/OvmfPkg/OvmfPkgIa32X64.dsc > index 8143ea9..f7855b6 100644 > --- a/OvmfPkg/OvmfPkgIa32X64.dsc > +++ b/OvmfPkg/OvmfPkgIa32X64.dsc > @@ -513,7 +513,7 @@ > # > OvmfPkg/Sec/SecMain.inf { > <LibraryClasses> > - > NULL|IntelFrameworkModulePkg/Library/LzmaCustomDecompressLib/LzmaCustomDecompress > Lib.inf > + > NULL|MdeModulePkg/Library/LzmaCustomDecompressLib/LzmaCustomDecompressLib.inf > } > > # > @@ -559,7 +559,7 @@ > # > MdeModulePkg/Core/Dxe/DxeMain.inf { > <LibraryClasses> > - > NULL|IntelFrameworkModulePkg/Library/LzmaCustomDecompressLib/LzmaCustomDecompress > Lib.inf > + > NULL|MdeModulePkg/Library/LzmaCustomDecompressLib/LzmaCustomDecompressLib.inf > DevicePathLib|MdePkg/Library/UefiDevicePathLib/UefiDevicePathLib.inf > } > > diff --git a/OvmfPkg/OvmfPkgX64.dsc b/OvmfPkg/OvmfPkgX64.dsc > index d48d603..e933a41 100644 > --- a/OvmfPkg/OvmfPkgX64.dsc > +++ b/OvmfPkg/OvmfPkgX64.dsc > @@ -512,7 +512,7 @@ > # > OvmfPkg/Sec/SecMain.inf { > <LibraryClasses> > - > NULL|IntelFrameworkModulePkg/Library/LzmaCustomDecompressLib/LzmaCustomDecompress > Lib.inf > + > NULL|MdeModulePkg/Library/LzmaCustomDecompressLib/LzmaCustomDecompressLib.inf > } > > # > @@ -557,7 +557,7 @@ > # > MdeModulePkg/Core/Dxe/DxeMain.inf { > <LibraryClasses> > - > NULL|IntelFrameworkModulePkg/Library/LzmaCustomDecompressLib/LzmaCustomDecompress > Lib.inf > + > NULL|MdeModulePkg/Library/LzmaCustomDecompressLib/LzmaCustomDecompressLib.inf > DevicePathLib|MdePkg/Library/UefiDevicePathLib/UefiDevicePathLib.inf > } > > diff --git a/QuarkSocPkg/QuarkSocPkg.dsc b/QuarkSocPkg/QuarkSocPkg.dsc > index 42bb5bb..9e37a0b 100644 > --- a/QuarkSocPkg/QuarkSocPkg.dsc > +++ b/QuarkSocPkg/QuarkSocPkg.dsc > @@ -116,7 +116,7 @@ > # > # Misc > # > - > DebugLib|IntelFrameworkModulePkg/Library/PeiDxeDebugLibReportStatusCode/PeiDxeDeb > ugLibReportStatusCode.inf > + > DebugLib|MdeModulePkg/Library/PeiDxeDebugLibReportStatusCode/PeiDxeDebugLibReport > StatusCode.inf > > DebugPrintErrorLevelLib|MdePkg/Library/BaseDebugPrintErrorLevelLib/BaseDebugPrint > ErrorLevelLib.inf > > PerformanceLib|MdePkg/Library/BasePerformanceLibNull/BasePerformanceLibNull.inf > PcdLib|MdePkg/Library/BasePcdLibNull/BasePcdLibNull.inf > diff --git a/Vlv2TbltDevicePkg/PlatformPkgGccX64.dsc > b/Vlv2TbltDevicePkg/PlatformPkgGccX64.dsc > index c3dc25f..9da6c97 100644 > --- a/Vlv2TbltDevicePkg/PlatformPkgGccX64.dsc > +++ b/Vlv2TbltDevicePkg/PlatformPkgGccX64.dsc > @@ -1064,7 +1064,7 @@ > $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)$(TARGET)/IA32/fTPMInitPeim.inf > MdeModulePkg/Core/DxeIplPeim/DxeIpl.inf { > <LibraryClasses> > !if $(LZMA_ENABLE) == TRUE > - > NULL|IntelFrameworkModulePkg/Library/LzmaCustomDecompressLib/LzmaCustomDecompress > Lib.inf > + > NULL|MdeModulePkg/Library/LzmaCustomDecompressLib/LzmaCustomDecompressLib.inf > !endif > } > > @@ -1121,7 +1121,7 @@ > $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)$(TARGET)/IA32/fTPMInitPeim.inf > > NULL|MdeModulePkg/Library/DxeCrc32GuidedSectionExtractLib/DxeCrc32GuidedSectionEx > tractLib.inf > !endif > !if $(LZMA_ENABLE) == TRUE > - > NULL|IntelFrameworkModulePkg/Library/LzmaCustomDecompressLib/LzmaCustomDecompress > Lib.inf > + > NULL|MdeModulePkg/Library/LzmaCustomDecompressLib/LzmaCustomDecompressLib.inf > !endif > !if $(TARGET) != RELEASE > DebugLib|MdePkg/Library/BaseDebugLibSerialPort/BaseDebugLibSerialPort.inf > diff --git a/Vlv2TbltDevicePkg/PlatformPkgIA32.dsc > b/Vlv2TbltDevicePkg/PlatformPkgIA32.dsc > index 3a5776a..556e4cf 100644 > --- a/Vlv2TbltDevicePkg/PlatformPkgIA32.dsc > +++ b/Vlv2TbltDevicePkg/PlatformPkgIA32.dsc > @@ -332,7 +332,7 @@ > DebugLib|MdePkg/Library/BaseDebugLibNull/BaseDebugLibNull.inf > SerialPortLib|MdePkg/Library/BaseSerialPortLibNull/BaseSerialPortLibNull.inf > !else > - > DebugLib|IntelFrameworkModulePkg/Library/PeiDxeDebugLibReportStatusCode/PeiDxeDeb > ugLibReportStatusCode.inf > + > DebugLib|MdeModulePkg/Library/PeiDxeDebugLibReportStatusCode/PeiDxeDebugLibReport > StatusCode.inf > SerialPortLib|$(PLATFORM_PACKAGE)/Library/SerialPortLib/SerialPortLib.inf > !endif > > @@ -1058,7 +1058,7 @@ > $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)$(TARGET)/IA32/fTPMInitPeim.inf > MdeModulePkg/Core/DxeIplPeim/DxeIpl.inf { > <LibraryClasses> > !if $(LZMA_ENABLE) == TRUE > - > NULL|IntelFrameworkModulePkg/Library/LzmaCustomDecompressLib/LzmaCustomDecompress > Lib.inf > + > NULL|MdeModulePkg/Library/LzmaCustomDecompressLib/LzmaCustomDecompressLib.inf > !endif > } > > @@ -1115,7 +1115,7 @@ > $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)$(TARGET)/IA32/fTPMInitPeim.inf > > NULL|MdeModulePkg/Library/DxeCrc32GuidedSectionExtractLib/DxeCrc32GuidedSectionEx > tractLib.inf > !endif > !if $(LZMA_ENABLE) == TRUE > - > NULL|IntelFrameworkModulePkg/Library/LzmaCustomDecompressLib/LzmaCustomDecompress > Lib.inf > + > NULL|MdeModulePkg/Library/LzmaCustomDecompressLib/LzmaCustomDecompressLib.inf > !endif > !if $(TARGET) != RELEASE > DebugLib|MdePkg/Library/BaseDebugLibSerialPort/BaseDebugLibSerialPort.inf > diff --git a/Vlv2TbltDevicePkg/PlatformPkgX64.dsc > b/Vlv2TbltDevicePkg/PlatformPkgX64.dsc > index 83cbb0a..4f08ad4 100644 > --- a/Vlv2TbltDevicePkg/PlatformPkgX64.dsc > +++ b/Vlv2TbltDevicePkg/PlatformPkgX64.dsc > @@ -332,7 +332,7 @@ > DebugLib|MdePkg/Library/BaseDebugLibNull/BaseDebugLibNull.inf > SerialPortLib|MdePkg/Library/BaseSerialPortLibNull/BaseSerialPortLibNull.inf > !else > - > DebugLib|IntelFrameworkModulePkg/Library/PeiDxeDebugLibReportStatusCode/PeiDxeDeb > ugLibReportStatusCode.inf > + > DebugLib|MdeModulePkg/Library/PeiDxeDebugLibReportStatusCode/PeiDxeDebugLibReport > StatusCode.inf > SerialPortLib|$(PLATFORM_PACKAGE)/Library/SerialPortLib/SerialPortLib.inf > !endif > > @@ -1058,7 +1058,7 @@ > $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)$(TARGET)/IA32/fTPMInitPeim.inf > MdeModulePkg/Core/DxeIplPeim/DxeIpl.inf { > <LibraryClasses> > !if $(LZMA_ENABLE) == TRUE > - > NULL|IntelFrameworkModulePkg/Library/LzmaCustomDecompressLib/LzmaCustomDecompress > Lib.inf > + > NULL|MdeModulePkg/Library/LzmaCustomDecompressLib/LzmaCustomDecompressLib.inf > !endif > } > > @@ -1115,7 +1115,7 @@ > $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)$(TARGET)/IA32/fTPMInitPeim.inf > > NULL|MdeModulePkg/Library/DxeCrc32GuidedSectionExtractLib/DxeCrc32GuidedSectionEx > tractLib.inf > !endif > !if $(LZMA_ENABLE) == TRUE > - > NULL|IntelFrameworkModulePkg/Library/LzmaCustomDecompressLib/LzmaCustomDecompress > Lib.inf > + > NULL|MdeModulePkg/Library/LzmaCustomDecompressLib/LzmaCustomDecompressLib.inf > !endif > !if $(TARGET) != RELEASE > DebugLib|MdePkg/Library/BaseDebugLibSerialPort/BaseDebugLibSerialPort.inf > -- > 2.10.2 _______________________________________________ edk2-devel mailing list edk2-devel@lists.01.org https://lists.01.org/mailman/listinfo/edk2-devel
On Thu, Dec 01, 2016 at 09:52:15AM +0800, Zeng, Star wrote: > On 2016/12/1 1:20, Leif Lindholm wrote: > >LzmaCustomDecompressLib and PeiDxeDebugLibReportStatusCode were copied > >from IntelFrameworkModulePkg to MdeModulePkg, but the originals were > >kept for compatibility. > > > >Nevertheless, new code should be using the MdeModulePkg versions, so > >change all references in in-tree platforms. > > > >Contributed-under: TianoCore Contribution Agreement 1.0 > >Signed-off-by: Leif Lindholm <leif.lindholm@linaro.org> > >--- > > BeagleBoardPkg/BeagleBoardPkg.dsc | 4 ++-- > > DuetPkg/DuetPkgIa32.dsc | 4 ++-- > > DuetPkg/DuetPkgX64.dsc | 4 ++-- > > EmbeddedPkg/EmbeddedPkg.dsc | 2 +- > > EmulatorPkg/EmulatorPkg.dsc | 4 ++-- > > IntelFrameworkModulePkg/IntelFrameworkModulePkg.dsc | 6 +++--- > > The change to IntelFrameworkModulePkg.dsc should be not needed as the > package dsc is for package build to cover the libraries and modules in that > package. OK, yes, I admit my approach was of the shotgun variety. I will drop the modifications to IntelFrameworkModulePkg when I split this up into individual patches. Thanks! / Leif > Other changes look good to me. > > > Thanks, > Star > > > OvmfPkg/OvmfPkgIa32.dsc | 4 ++-- > > OvmfPkg/OvmfPkgIa32X64.dsc | 4 ++-- > > OvmfPkg/OvmfPkgX64.dsc | 4 ++-- > > QuarkSocPkg/QuarkSocPkg.dsc | 2 +- > > Vlv2TbltDevicePkg/PlatformPkgGccX64.dsc | 4 ++-- > > Vlv2TbltDevicePkg/PlatformPkgIA32.dsc | 6 +++--- > > Vlv2TbltDevicePkg/PlatformPkgX64.dsc | 6 +++--- > > 13 files changed, 27 insertions(+), 27 deletions(-) > > > >diff --git a/BeagleBoardPkg/BeagleBoardPkg.dsc b/BeagleBoardPkg/BeagleBoardPkg.dsc > >index f40095a..b074b92 100644 > >--- a/BeagleBoardPkg/BeagleBoardPkg.dsc > >+++ b/BeagleBoardPkg/BeagleBoardPkg.dsc > >@@ -141,7 +141,7 @@ > > > > [LibraryClasses.common.SEC] > > PcdLib|MdePkg/Library/BasePcdLibNull/BasePcdLibNull.inf > >- ReportStatusCodeLib|IntelFrameworkModulePkg/Library/PeiDxeDebugLibReportStatusCode/PeiDxeDebugLibReportStatusCode.inf > >+ ReportStatusCodeLib|MdeModulePkg/Library/PeiDxeDebugLibReportStatusCode/PeiDxeDebugLibReportStatusCode.inf > > UefiDecompressLib|MdePkg/Library/BaseUefiDecompressLib/BaseUefiDecompressLib.inf > > ExtractGuidedSectionLib|EmbeddedPkg/Library/PrePiExtractGuidedSectionLib/PrePiExtractGuidedSectionLib.inf > > LzmaDecompressLib|MdeModulePkg/Library/LzmaCustomDecompressLib/LzmaCustomDecompressLib.inf > >@@ -163,7 +163,7 @@ > > > > [LibraryClasses.common.PEI_CORE] > > PcdLib|MdePkg/Library/BasePcdLibNull/BasePcdLibNull.inf > >- ReportStatusCodeLib|IntelFrameworkModulePkg/Library/PeiDxeDebugLibReportStatusCode/PeiDxeDebugLibReportStatusCode.inf > >+ ReportStatusCodeLib|MdeModulePkg/Library/PeiDxeDebugLibReportStatusCode/PeiDxeDebugLibReportStatusCode.inf > > > > [LibraryClasses.common.DXE_CORE] > > HobLib|MdePkg/Library/DxeCoreHobLib/DxeCoreHobLib.inf > >diff --git a/DuetPkg/DuetPkgIa32.dsc b/DuetPkg/DuetPkgIa32.dsc > >index 3b59343..7dd963b 100644 > >--- a/DuetPkg/DuetPkgIa32.dsc > >+++ b/DuetPkg/DuetPkgIa32.dsc > >@@ -178,7 +178,7 @@ > > gEfiMdePkgTokenSpaceGuid.PcdDebugPropertyMask|0x2F > > gEfiMdePkgTokenSpaceGuid.PcdDebugPrintErrorLevel|0x80000042 > > <LibraryClasses> > >- DebugLib|IntelFrameworkModulePkg/Library/PeiDxeDebugLibReportStatusCode/PeiDxeDebugLibReportStatusCode.inf > >+ DebugLib|MdeModulePkg/Library/PeiDxeDebugLibReportStatusCode/PeiDxeDebugLibReportStatusCode.inf > > ReportStatusCodeLib|DuetPkg/Library/DxeCoreReportStatusCodeLibFromHob/DxeCoreReportStatusCodeLibFromHob.inf > > } > > > >@@ -211,7 +211,7 @@ > > DuetPkg/EfiLdr/EfiLdr.inf { > > <LibraryClasses> > > DebugLib|MdePkg/Library/BaseDebugLibNull/BaseDebugLibNull.inf > >- NULL|IntelFrameworkModulePkg/Library/LzmaCustomDecompressLib/LzmaCustomDecompressLib.inf > >+ NULL|MdeModulePkg/Library/LzmaCustomDecompressLib/LzmaCustomDecompressLib.inf > > } > > IntelFrameworkModulePkg/Universal/BdsDxe/BdsDxe.inf { > > <LibraryClasses> > >diff --git a/DuetPkg/DuetPkgX64.dsc b/DuetPkg/DuetPkgX64.dsc > >index c23354a..1b08a95 100644 > >--- a/DuetPkg/DuetPkgX64.dsc > >+++ b/DuetPkg/DuetPkgX64.dsc > >@@ -179,7 +179,7 @@ > > gEfiMdePkgTokenSpaceGuid.PcdDebugPropertyMask|0x2F > > gEfiMdePkgTokenSpaceGuid.PcdDebugPrintErrorLevel|0x80000042 > > <LibraryClasses> > >- DebugLib|IntelFrameworkModulePkg/Library/PeiDxeDebugLibReportStatusCode/PeiDxeDebugLibReportStatusCode.inf > >+ DebugLib|MdeModulePkg/Library/PeiDxeDebugLibReportStatusCode/PeiDxeDebugLibReportStatusCode.inf > > ReportStatusCodeLib|DuetPkg/Library/DxeCoreReportStatusCodeLibFromHob/DxeCoreReportStatusCodeLibFromHob.inf > > } > > > >@@ -212,7 +212,7 @@ > > DuetPkg/EfiLdr/EfiLdr.inf { > > <LibraryClasses> > > DebugLib|MdePkg/Library/BaseDebugLibNull/BaseDebugLibNull.inf > >- NULL|IntelFrameworkModulePkg/Library/LzmaCustomDecompressLib/LzmaCustomDecompressLib.inf > >+ NULL|MdeModulePkg/Library/LzmaCustomDecompressLib/LzmaCustomDecompressLib.inf > > } > > IntelFrameworkModulePkg/Universal/BdsDxe/BdsDxe.inf { > > <LibraryClasses> > >diff --git a/EmbeddedPkg/EmbeddedPkg.dsc b/EmbeddedPkg/EmbeddedPkg.dsc > >index eb7af80..ba4f1ea 100644 > >--- a/EmbeddedPkg/EmbeddedPkg.dsc > >+++ b/EmbeddedPkg/EmbeddedPkg.dsc > >@@ -60,7 +60,7 @@ > > UefiDecompressLib|MdePkg/Library/BaseUefiDecompressLib/BaseUefiDecompressLib.inf > > EfiFileLib|EmbeddedPkg/Library/EfiFileLib/EfiFileLib.inf > > > >- ReportStatusCodeLib|IntelFrameworkModulePkg/Library/PeiDxeDebugLibReportStatusCode/PeiDxeDebugLibReportStatusCode.inf > >+ ReportStatusCodeLib|MdeModulePkg/Library/PeiDxeDebugLibReportStatusCode/PeiDxeDebugLibReportStatusCode.inf > > > > PeCoffGetEntryPointLib|MdePkg/Library/BasePeCoffGetEntryPointLib/BasePeCoffGetEntryPointLib.inf > > PeCoffLib|MdePkg/Library/BasePeCoffLib/BasePeCoffLib.inf > >diff --git a/EmulatorPkg/EmulatorPkg.dsc b/EmulatorPkg/EmulatorPkg.dsc > >index f516adf..b96b9f2 100644 > >--- a/EmulatorPkg/EmulatorPkg.dsc > >+++ b/EmulatorPkg/EmulatorPkg.dsc > >@@ -101,7 +101,7 @@ > > PerformanceLib|MdePkg/Library/BasePerformanceLibNull/BasePerformanceLibNull.inf > > DebugAgentLib|MdeModulePkg/Library/DebugAgentLibNull/DebugAgentLibNull.inf > > PeiServicesTablePointerLib|EmulatorPkg/Library/PeiServicesTablePointerLibMagicPage/PeiServicesTablePointerLibMagicPage.inf > >- DebugLib|IntelFrameworkModulePkg/Library/PeiDxeDebugLibReportStatusCode/PeiDxeDebugLibReportStatusCode.inf > >+ DebugLib|MdeModulePkg/Library/PeiDxeDebugLibReportStatusCode/PeiDxeDebugLibReportStatusCode.inf > > LockBoxLib|MdeModulePkg/Library/LockBoxNullLib/LockBoxNullLib.inf > > CpuExceptionHandlerLib|MdeModulePkg/Library/CpuExceptionHandlerLibNull/CpuExceptionHandlerLibNull.inf > > TpmMeasurementLib|MdeModulePkg/Library/TpmMeasurementLibNull/TpmMeasurementLibNull.inf > >@@ -281,7 +281,7 @@ > > SerialPortLib|EmulatorPkg/Library/DxeEmuStdErrSerialPortLib/DxeEmuStdErrSerialPortLib.inf > > DxeEmuLib|EmulatorPkg/Library/DxeEmuLib/DxeEmuLib.inf > > NULL|MdeModulePkg/Library/DxeCrc32GuidedSectionExtractLib/DxeCrc32GuidedSectionExtractLib.inf > >- NULL|IntelFrameworkModulePkg/Library/LzmaCustomDecompressLib/LzmaCustomDecompressLib.inf > >+ NULL|MdeModulePkg/Library/LzmaCustomDecompressLib/LzmaCustomDecompressLib.inf > > } > > MdeModulePkg/Universal/PCD/Dxe/Pcd.inf { > > <LibraryClasses> > >diff --git a/IntelFrameworkModulePkg/IntelFrameworkModulePkg.dsc b/IntelFrameworkModulePkg/IntelFrameworkModulePkg.dsc > >index a9a01aa..2df2dec 100644 > >--- a/IntelFrameworkModulePkg/IntelFrameworkModulePkg.dsc > >+++ b/IntelFrameworkModulePkg/IntelFrameworkModulePkg.dsc > >@@ -130,12 +130,12 @@ > > > > [Components] > > IntelFrameworkModulePkg/Library/BaseUefiTianoCustomDecompressLib/BaseUefiTianoCustomDecompressLib.inf > >- IntelFrameworkModulePkg/Library/LzmaCustomDecompressLib/LzmaCustomDecompressLib.inf > >+ MdeModulePkg/Library/LzmaCustomDecompressLib/LzmaCustomDecompressLib.inf > > IntelFrameworkModulePkg/Library/PeiS3Lib/PeiS3Lib.inf > > IntelFrameworkModulePkg/Library/PeiRecoveryLib/PeiRecoveryLib.inf > > IntelFrameworkModulePkg/Library/DxeReportStatusCodeLibFramework/DxeReportStatusCodeLib.inf > > IntelFrameworkModulePkg/Library/SmmRuntimeDxeReportStatusCodeLibFramework/SmmRuntimeDxeReportStatusCodeLibFramework.inf > >- IntelFrameworkModulePkg/Library/PeiDxeDebugLibReportStatusCode/PeiDxeDebugLibReportStatusCode.inf > >+ MdeModulePkg/Library/PeiDxeDebugLibReportStatusCode/PeiDxeDebugLibReportStatusCode.inf > > IntelFrameworkModulePkg/Library/PlatformBdsLibNull/PlatformBdsLibNull.inf > > IntelFrameworkModulePkg/Library/GenericBdsLib/GenericBdsLib.inf > > IntelFrameworkModulePkg/Library/DxeCapsuleLib/DxeCapsuleLib.inf > >@@ -172,7 +172,7 @@ > > > > [Components.IA32,Components.X64] > > IntelFrameworkModulePkg/Universal/Acpi/AcpiS3SaveDxe/AcpiS3SaveDxe.inf > >- IntelFrameworkModulePkg/Library/LzmaCustomDecompressLib/LzmaArchCustomDecompressLib.inf > >+ MdeModulePkg/Library/LzmaCustomDecompressLib/LzmaArchCustomDecompressLib.inf > > > > [Components.IA32,Components.X64,Components.IPF] > > IntelFrameworkModulePkg/Csm/LegacyBiosDxe/LegacyBiosDxe.inf > >diff --git a/OvmfPkg/OvmfPkgIa32.dsc b/OvmfPkg/OvmfPkgIa32.dsc > >index d913030..81f7521 100644 > >--- a/OvmfPkg/OvmfPkgIa32.dsc > >+++ b/OvmfPkg/OvmfPkgIa32.dsc > >@@ -505,7 +505,7 @@ > > # > > OvmfPkg/Sec/SecMain.inf { > > <LibraryClasses> > >- NULL|IntelFrameworkModulePkg/Library/LzmaCustomDecompressLib/LzmaCustomDecompressLib.inf > >+ NULL|MdeModulePkg/Library/LzmaCustomDecompressLib/LzmaCustomDecompressLib.inf > > } > > > > # > >@@ -550,7 +550,7 @@ > > # > > MdeModulePkg/Core/Dxe/DxeMain.inf { > > <LibraryClasses> > >- NULL|IntelFrameworkModulePkg/Library/LzmaCustomDecompressLib/LzmaCustomDecompressLib.inf > >+ NULL|MdeModulePkg/Library/LzmaCustomDecompressLib/LzmaCustomDecompressLib.inf > > DevicePathLib|MdePkg/Library/UefiDevicePathLib/UefiDevicePathLib.inf > > } > > > >diff --git a/OvmfPkg/OvmfPkgIa32X64.dsc b/OvmfPkg/OvmfPkgIa32X64.dsc > >index 8143ea9..f7855b6 100644 > >--- a/OvmfPkg/OvmfPkgIa32X64.dsc > >+++ b/OvmfPkg/OvmfPkgIa32X64.dsc > >@@ -513,7 +513,7 @@ > > # > > OvmfPkg/Sec/SecMain.inf { > > <LibraryClasses> > >- NULL|IntelFrameworkModulePkg/Library/LzmaCustomDecompressLib/LzmaCustomDecompressLib.inf > >+ NULL|MdeModulePkg/Library/LzmaCustomDecompressLib/LzmaCustomDecompressLib.inf > > } > > > > # > >@@ -559,7 +559,7 @@ > > # > > MdeModulePkg/Core/Dxe/DxeMain.inf { > > <LibraryClasses> > >- NULL|IntelFrameworkModulePkg/Library/LzmaCustomDecompressLib/LzmaCustomDecompressLib.inf > >+ NULL|MdeModulePkg/Library/LzmaCustomDecompressLib/LzmaCustomDecompressLib.inf > > DevicePathLib|MdePkg/Library/UefiDevicePathLib/UefiDevicePathLib.inf > > } > > > >diff --git a/OvmfPkg/OvmfPkgX64.dsc b/OvmfPkg/OvmfPkgX64.dsc > >index d48d603..e933a41 100644 > >--- a/OvmfPkg/OvmfPkgX64.dsc > >+++ b/OvmfPkg/OvmfPkgX64.dsc > >@@ -512,7 +512,7 @@ > > # > > OvmfPkg/Sec/SecMain.inf { > > <LibraryClasses> > >- NULL|IntelFrameworkModulePkg/Library/LzmaCustomDecompressLib/LzmaCustomDecompressLib.inf > >+ NULL|MdeModulePkg/Library/LzmaCustomDecompressLib/LzmaCustomDecompressLib.inf > > } > > > > # > >@@ -557,7 +557,7 @@ > > # > > MdeModulePkg/Core/Dxe/DxeMain.inf { > > <LibraryClasses> > >- NULL|IntelFrameworkModulePkg/Library/LzmaCustomDecompressLib/LzmaCustomDecompressLib.inf > >+ NULL|MdeModulePkg/Library/LzmaCustomDecompressLib/LzmaCustomDecompressLib.inf > > DevicePathLib|MdePkg/Library/UefiDevicePathLib/UefiDevicePathLib.inf > > } > > > >diff --git a/QuarkSocPkg/QuarkSocPkg.dsc b/QuarkSocPkg/QuarkSocPkg.dsc > >index 42bb5bb..9e37a0b 100644 > >--- a/QuarkSocPkg/QuarkSocPkg.dsc > >+++ b/QuarkSocPkg/QuarkSocPkg.dsc > >@@ -116,7 +116,7 @@ > > # > > # Misc > > # > >- DebugLib|IntelFrameworkModulePkg/Library/PeiDxeDebugLibReportStatusCode/PeiDxeDebugLibReportStatusCode.inf > >+ DebugLib|MdeModulePkg/Library/PeiDxeDebugLibReportStatusCode/PeiDxeDebugLibReportStatusCode.inf > > DebugPrintErrorLevelLib|MdePkg/Library/BaseDebugPrintErrorLevelLib/BaseDebugPrintErrorLevelLib.inf > > PerformanceLib|MdePkg/Library/BasePerformanceLibNull/BasePerformanceLibNull.inf > > PcdLib|MdePkg/Library/BasePcdLibNull/BasePcdLibNull.inf > >diff --git a/Vlv2TbltDevicePkg/PlatformPkgGccX64.dsc b/Vlv2TbltDevicePkg/PlatformPkgGccX64.dsc > >index c3dc25f..9da6c97 100644 > >--- a/Vlv2TbltDevicePkg/PlatformPkgGccX64.dsc > >+++ b/Vlv2TbltDevicePkg/PlatformPkgGccX64.dsc > >@@ -1064,7 +1064,7 @@ $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)$(TARGET)/IA32/fTPMInitPeim.inf > > MdeModulePkg/Core/DxeIplPeim/DxeIpl.inf { > > <LibraryClasses> > > !if $(LZMA_ENABLE) == TRUE > >- NULL|IntelFrameworkModulePkg/Library/LzmaCustomDecompressLib/LzmaCustomDecompressLib.inf > >+ NULL|MdeModulePkg/Library/LzmaCustomDecompressLib/LzmaCustomDecompressLib.inf > > !endif > > } > > > >@@ -1121,7 +1121,7 @@ $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)$(TARGET)/IA32/fTPMInitPeim.inf > > NULL|MdeModulePkg/Library/DxeCrc32GuidedSectionExtractLib/DxeCrc32GuidedSectionExtractLib.inf > > !endif > > !if $(LZMA_ENABLE) == TRUE > >- NULL|IntelFrameworkModulePkg/Library/LzmaCustomDecompressLib/LzmaCustomDecompressLib.inf > >+ NULL|MdeModulePkg/Library/LzmaCustomDecompressLib/LzmaCustomDecompressLib.inf > > !endif > > !if $(TARGET) != RELEASE > > DebugLib|MdePkg/Library/BaseDebugLibSerialPort/BaseDebugLibSerialPort.inf > >diff --git a/Vlv2TbltDevicePkg/PlatformPkgIA32.dsc b/Vlv2TbltDevicePkg/PlatformPkgIA32.dsc > >index 3a5776a..556e4cf 100644 > >--- a/Vlv2TbltDevicePkg/PlatformPkgIA32.dsc > >+++ b/Vlv2TbltDevicePkg/PlatformPkgIA32.dsc > >@@ -332,7 +332,7 @@ > > DebugLib|MdePkg/Library/BaseDebugLibNull/BaseDebugLibNull.inf > > SerialPortLib|MdePkg/Library/BaseSerialPortLibNull/BaseSerialPortLibNull.inf > > !else > >- DebugLib|IntelFrameworkModulePkg/Library/PeiDxeDebugLibReportStatusCode/PeiDxeDebugLibReportStatusCode.inf > >+ DebugLib|MdeModulePkg/Library/PeiDxeDebugLibReportStatusCode/PeiDxeDebugLibReportStatusCode.inf > > SerialPortLib|$(PLATFORM_PACKAGE)/Library/SerialPortLib/SerialPortLib.inf > > !endif > > > >@@ -1058,7 +1058,7 @@ $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)$(TARGET)/IA32/fTPMInitPeim.inf > > MdeModulePkg/Core/DxeIplPeim/DxeIpl.inf { > > <LibraryClasses> > > !if $(LZMA_ENABLE) == TRUE > >- NULL|IntelFrameworkModulePkg/Library/LzmaCustomDecompressLib/LzmaCustomDecompressLib.inf > >+ NULL|MdeModulePkg/Library/LzmaCustomDecompressLib/LzmaCustomDecompressLib.inf > > !endif > > } > > > >@@ -1115,7 +1115,7 @@ $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)$(TARGET)/IA32/fTPMInitPeim.inf > > NULL|MdeModulePkg/Library/DxeCrc32GuidedSectionExtractLib/DxeCrc32GuidedSectionExtractLib.inf > > !endif > > !if $(LZMA_ENABLE) == TRUE > >- NULL|IntelFrameworkModulePkg/Library/LzmaCustomDecompressLib/LzmaCustomDecompressLib.inf > >+ NULL|MdeModulePkg/Library/LzmaCustomDecompressLib/LzmaCustomDecompressLib.inf > > !endif > > !if $(TARGET) != RELEASE > > DebugLib|MdePkg/Library/BaseDebugLibSerialPort/BaseDebugLibSerialPort.inf > >diff --git a/Vlv2TbltDevicePkg/PlatformPkgX64.dsc b/Vlv2TbltDevicePkg/PlatformPkgX64.dsc > >index 83cbb0a..4f08ad4 100644 > >--- a/Vlv2TbltDevicePkg/PlatformPkgX64.dsc > >+++ b/Vlv2TbltDevicePkg/PlatformPkgX64.dsc > >@@ -332,7 +332,7 @@ > > DebugLib|MdePkg/Library/BaseDebugLibNull/BaseDebugLibNull.inf > > SerialPortLib|MdePkg/Library/BaseSerialPortLibNull/BaseSerialPortLibNull.inf > > !else > >- DebugLib|IntelFrameworkModulePkg/Library/PeiDxeDebugLibReportStatusCode/PeiDxeDebugLibReportStatusCode.inf > >+ DebugLib|MdeModulePkg/Library/PeiDxeDebugLibReportStatusCode/PeiDxeDebugLibReportStatusCode.inf > > SerialPortLib|$(PLATFORM_PACKAGE)/Library/SerialPortLib/SerialPortLib.inf > > !endif > > > >@@ -1058,7 +1058,7 @@ $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)$(TARGET)/IA32/fTPMInitPeim.inf > > MdeModulePkg/Core/DxeIplPeim/DxeIpl.inf { > > <LibraryClasses> > > !if $(LZMA_ENABLE) == TRUE > >- NULL|IntelFrameworkModulePkg/Library/LzmaCustomDecompressLib/LzmaCustomDecompressLib.inf > >+ NULL|MdeModulePkg/Library/LzmaCustomDecompressLib/LzmaCustomDecompressLib.inf > > !endif > > } > > > >@@ -1115,7 +1115,7 @@ $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)$(TARGET)/IA32/fTPMInitPeim.inf > > NULL|MdeModulePkg/Library/DxeCrc32GuidedSectionExtractLib/DxeCrc32GuidedSectionExtractLib.inf > > !endif > > !if $(LZMA_ENABLE) == TRUE > >- NULL|IntelFrameworkModulePkg/Library/LzmaCustomDecompressLib/LzmaCustomDecompressLib.inf > >+ NULL|MdeModulePkg/Library/LzmaCustomDecompressLib/LzmaCustomDecompressLib.inf > > !endif > > !if $(TARGET) != RELEASE > > DebugLib|MdePkg/Library/BaseDebugLibSerialPort/BaseDebugLibSerialPort.inf > > > _______________________________________________ edk2-devel mailing list edk2-devel@lists.01.org https://lists.01.org/mailman/listinfo/edk2-devel
diff --git a/BeagleBoardPkg/BeagleBoardPkg.dsc b/BeagleBoardPkg/BeagleBoardPkg.dsc index f40095a..b074b92 100644 --- a/BeagleBoardPkg/BeagleBoardPkg.dsc +++ b/BeagleBoardPkg/BeagleBoardPkg.dsc @@ -141,7 +141,7 @@ [LibraryClasses.common.SEC] PcdLib|MdePkg/Library/BasePcdLibNull/BasePcdLibNull.inf - ReportStatusCodeLib|IntelFrameworkModulePkg/Library/PeiDxeDebugLibReportStatusCode/PeiDxeDebugLibReportStatusCode.inf + ReportStatusCodeLib|MdeModulePkg/Library/PeiDxeDebugLibReportStatusCode/PeiDxeDebugLibReportStatusCode.inf UefiDecompressLib|MdePkg/Library/BaseUefiDecompressLib/BaseUefiDecompressLib.inf ExtractGuidedSectionLib|EmbeddedPkg/Library/PrePiExtractGuidedSectionLib/PrePiExtractGuidedSectionLib.inf LzmaDecompressLib|MdeModulePkg/Library/LzmaCustomDecompressLib/LzmaCustomDecompressLib.inf @@ -163,7 +163,7 @@ [LibraryClasses.common.PEI_CORE] PcdLib|MdePkg/Library/BasePcdLibNull/BasePcdLibNull.inf - ReportStatusCodeLib|IntelFrameworkModulePkg/Library/PeiDxeDebugLibReportStatusCode/PeiDxeDebugLibReportStatusCode.inf + ReportStatusCodeLib|MdeModulePkg/Library/PeiDxeDebugLibReportStatusCode/PeiDxeDebugLibReportStatusCode.inf [LibraryClasses.common.DXE_CORE] HobLib|MdePkg/Library/DxeCoreHobLib/DxeCoreHobLib.inf diff --git a/DuetPkg/DuetPkgIa32.dsc b/DuetPkg/DuetPkgIa32.dsc index 3b59343..7dd963b 100644 --- a/DuetPkg/DuetPkgIa32.dsc +++ b/DuetPkg/DuetPkgIa32.dsc @@ -178,7 +178,7 @@ gEfiMdePkgTokenSpaceGuid.PcdDebugPropertyMask|0x2F gEfiMdePkgTokenSpaceGuid.PcdDebugPrintErrorLevel|0x80000042 <LibraryClasses> - DebugLib|IntelFrameworkModulePkg/Library/PeiDxeDebugLibReportStatusCode/PeiDxeDebugLibReportStatusCode.inf + DebugLib|MdeModulePkg/Library/PeiDxeDebugLibReportStatusCode/PeiDxeDebugLibReportStatusCode.inf ReportStatusCodeLib|DuetPkg/Library/DxeCoreReportStatusCodeLibFromHob/DxeCoreReportStatusCodeLibFromHob.inf } @@ -211,7 +211,7 @@ DuetPkg/EfiLdr/EfiLdr.inf { <LibraryClasses> DebugLib|MdePkg/Library/BaseDebugLibNull/BaseDebugLibNull.inf - NULL|IntelFrameworkModulePkg/Library/LzmaCustomDecompressLib/LzmaCustomDecompressLib.inf + NULL|MdeModulePkg/Library/LzmaCustomDecompressLib/LzmaCustomDecompressLib.inf } IntelFrameworkModulePkg/Universal/BdsDxe/BdsDxe.inf { <LibraryClasses> diff --git a/DuetPkg/DuetPkgX64.dsc b/DuetPkg/DuetPkgX64.dsc index c23354a..1b08a95 100644 --- a/DuetPkg/DuetPkgX64.dsc +++ b/DuetPkg/DuetPkgX64.dsc @@ -179,7 +179,7 @@ gEfiMdePkgTokenSpaceGuid.PcdDebugPropertyMask|0x2F gEfiMdePkgTokenSpaceGuid.PcdDebugPrintErrorLevel|0x80000042 <LibraryClasses> - DebugLib|IntelFrameworkModulePkg/Library/PeiDxeDebugLibReportStatusCode/PeiDxeDebugLibReportStatusCode.inf + DebugLib|MdeModulePkg/Library/PeiDxeDebugLibReportStatusCode/PeiDxeDebugLibReportStatusCode.inf ReportStatusCodeLib|DuetPkg/Library/DxeCoreReportStatusCodeLibFromHob/DxeCoreReportStatusCodeLibFromHob.inf } @@ -212,7 +212,7 @@ DuetPkg/EfiLdr/EfiLdr.inf { <LibraryClasses> DebugLib|MdePkg/Library/BaseDebugLibNull/BaseDebugLibNull.inf - NULL|IntelFrameworkModulePkg/Library/LzmaCustomDecompressLib/LzmaCustomDecompressLib.inf + NULL|MdeModulePkg/Library/LzmaCustomDecompressLib/LzmaCustomDecompressLib.inf } IntelFrameworkModulePkg/Universal/BdsDxe/BdsDxe.inf { <LibraryClasses> diff --git a/EmbeddedPkg/EmbeddedPkg.dsc b/EmbeddedPkg/EmbeddedPkg.dsc index eb7af80..ba4f1ea 100644 --- a/EmbeddedPkg/EmbeddedPkg.dsc +++ b/EmbeddedPkg/EmbeddedPkg.dsc @@ -60,7 +60,7 @@ UefiDecompressLib|MdePkg/Library/BaseUefiDecompressLib/BaseUefiDecompressLib.inf EfiFileLib|EmbeddedPkg/Library/EfiFileLib/EfiFileLib.inf - ReportStatusCodeLib|IntelFrameworkModulePkg/Library/PeiDxeDebugLibReportStatusCode/PeiDxeDebugLibReportStatusCode.inf + ReportStatusCodeLib|MdeModulePkg/Library/PeiDxeDebugLibReportStatusCode/PeiDxeDebugLibReportStatusCode.inf PeCoffGetEntryPointLib|MdePkg/Library/BasePeCoffGetEntryPointLib/BasePeCoffGetEntryPointLib.inf PeCoffLib|MdePkg/Library/BasePeCoffLib/BasePeCoffLib.inf diff --git a/EmulatorPkg/EmulatorPkg.dsc b/EmulatorPkg/EmulatorPkg.dsc index f516adf..b96b9f2 100644 --- a/EmulatorPkg/EmulatorPkg.dsc +++ b/EmulatorPkg/EmulatorPkg.dsc @@ -101,7 +101,7 @@ PerformanceLib|MdePkg/Library/BasePerformanceLibNull/BasePerformanceLibNull.inf DebugAgentLib|MdeModulePkg/Library/DebugAgentLibNull/DebugAgentLibNull.inf PeiServicesTablePointerLib|EmulatorPkg/Library/PeiServicesTablePointerLibMagicPage/PeiServicesTablePointerLibMagicPage.inf - DebugLib|IntelFrameworkModulePkg/Library/PeiDxeDebugLibReportStatusCode/PeiDxeDebugLibReportStatusCode.inf + DebugLib|MdeModulePkg/Library/PeiDxeDebugLibReportStatusCode/PeiDxeDebugLibReportStatusCode.inf LockBoxLib|MdeModulePkg/Library/LockBoxNullLib/LockBoxNullLib.inf CpuExceptionHandlerLib|MdeModulePkg/Library/CpuExceptionHandlerLibNull/CpuExceptionHandlerLibNull.inf TpmMeasurementLib|MdeModulePkg/Library/TpmMeasurementLibNull/TpmMeasurementLibNull.inf @@ -281,7 +281,7 @@ SerialPortLib|EmulatorPkg/Library/DxeEmuStdErrSerialPortLib/DxeEmuStdErrSerialPortLib.inf DxeEmuLib|EmulatorPkg/Library/DxeEmuLib/DxeEmuLib.inf NULL|MdeModulePkg/Library/DxeCrc32GuidedSectionExtractLib/DxeCrc32GuidedSectionExtractLib.inf - NULL|IntelFrameworkModulePkg/Library/LzmaCustomDecompressLib/LzmaCustomDecompressLib.inf + NULL|MdeModulePkg/Library/LzmaCustomDecompressLib/LzmaCustomDecompressLib.inf } MdeModulePkg/Universal/PCD/Dxe/Pcd.inf { <LibraryClasses> diff --git a/IntelFrameworkModulePkg/IntelFrameworkModulePkg.dsc b/IntelFrameworkModulePkg/IntelFrameworkModulePkg.dsc index a9a01aa..2df2dec 100644 --- a/IntelFrameworkModulePkg/IntelFrameworkModulePkg.dsc +++ b/IntelFrameworkModulePkg/IntelFrameworkModulePkg.dsc @@ -130,12 +130,12 @@ [Components] IntelFrameworkModulePkg/Library/BaseUefiTianoCustomDecompressLib/BaseUefiTianoCustomDecompressLib.inf - IntelFrameworkModulePkg/Library/LzmaCustomDecompressLib/LzmaCustomDecompressLib.inf + MdeModulePkg/Library/LzmaCustomDecompressLib/LzmaCustomDecompressLib.inf IntelFrameworkModulePkg/Library/PeiS3Lib/PeiS3Lib.inf IntelFrameworkModulePkg/Library/PeiRecoveryLib/PeiRecoveryLib.inf IntelFrameworkModulePkg/Library/DxeReportStatusCodeLibFramework/DxeReportStatusCodeLib.inf IntelFrameworkModulePkg/Library/SmmRuntimeDxeReportStatusCodeLibFramework/SmmRuntimeDxeReportStatusCodeLibFramework.inf - IntelFrameworkModulePkg/Library/PeiDxeDebugLibReportStatusCode/PeiDxeDebugLibReportStatusCode.inf + MdeModulePkg/Library/PeiDxeDebugLibReportStatusCode/PeiDxeDebugLibReportStatusCode.inf IntelFrameworkModulePkg/Library/PlatformBdsLibNull/PlatformBdsLibNull.inf IntelFrameworkModulePkg/Library/GenericBdsLib/GenericBdsLib.inf IntelFrameworkModulePkg/Library/DxeCapsuleLib/DxeCapsuleLib.inf @@ -172,7 +172,7 @@ [Components.IA32,Components.X64] IntelFrameworkModulePkg/Universal/Acpi/AcpiS3SaveDxe/AcpiS3SaveDxe.inf - IntelFrameworkModulePkg/Library/LzmaCustomDecompressLib/LzmaArchCustomDecompressLib.inf + MdeModulePkg/Library/LzmaCustomDecompressLib/LzmaArchCustomDecompressLib.inf [Components.IA32,Components.X64,Components.IPF] IntelFrameworkModulePkg/Csm/LegacyBiosDxe/LegacyBiosDxe.inf diff --git a/OvmfPkg/OvmfPkgIa32.dsc b/OvmfPkg/OvmfPkgIa32.dsc index d913030..81f7521 100644 --- a/OvmfPkg/OvmfPkgIa32.dsc +++ b/OvmfPkg/OvmfPkgIa32.dsc @@ -505,7 +505,7 @@ # OvmfPkg/Sec/SecMain.inf { <LibraryClasses> - NULL|IntelFrameworkModulePkg/Library/LzmaCustomDecompressLib/LzmaCustomDecompressLib.inf + NULL|MdeModulePkg/Library/LzmaCustomDecompressLib/LzmaCustomDecompressLib.inf } # @@ -550,7 +550,7 @@ # MdeModulePkg/Core/Dxe/DxeMain.inf { <LibraryClasses> - NULL|IntelFrameworkModulePkg/Library/LzmaCustomDecompressLib/LzmaCustomDecompressLib.inf + NULL|MdeModulePkg/Library/LzmaCustomDecompressLib/LzmaCustomDecompressLib.inf DevicePathLib|MdePkg/Library/UefiDevicePathLib/UefiDevicePathLib.inf } diff --git a/OvmfPkg/OvmfPkgIa32X64.dsc b/OvmfPkg/OvmfPkgIa32X64.dsc index 8143ea9..f7855b6 100644 --- a/OvmfPkg/OvmfPkgIa32X64.dsc +++ b/OvmfPkg/OvmfPkgIa32X64.dsc @@ -513,7 +513,7 @@ # OvmfPkg/Sec/SecMain.inf { <LibraryClasses> - NULL|IntelFrameworkModulePkg/Library/LzmaCustomDecompressLib/LzmaCustomDecompressLib.inf + NULL|MdeModulePkg/Library/LzmaCustomDecompressLib/LzmaCustomDecompressLib.inf } # @@ -559,7 +559,7 @@ # MdeModulePkg/Core/Dxe/DxeMain.inf { <LibraryClasses> - NULL|IntelFrameworkModulePkg/Library/LzmaCustomDecompressLib/LzmaCustomDecompressLib.inf + NULL|MdeModulePkg/Library/LzmaCustomDecompressLib/LzmaCustomDecompressLib.inf DevicePathLib|MdePkg/Library/UefiDevicePathLib/UefiDevicePathLib.inf } diff --git a/OvmfPkg/OvmfPkgX64.dsc b/OvmfPkg/OvmfPkgX64.dsc index d48d603..e933a41 100644 --- a/OvmfPkg/OvmfPkgX64.dsc +++ b/OvmfPkg/OvmfPkgX64.dsc @@ -512,7 +512,7 @@ # OvmfPkg/Sec/SecMain.inf { <LibraryClasses> - NULL|IntelFrameworkModulePkg/Library/LzmaCustomDecompressLib/LzmaCustomDecompressLib.inf + NULL|MdeModulePkg/Library/LzmaCustomDecompressLib/LzmaCustomDecompressLib.inf } # @@ -557,7 +557,7 @@ # MdeModulePkg/Core/Dxe/DxeMain.inf { <LibraryClasses> - NULL|IntelFrameworkModulePkg/Library/LzmaCustomDecompressLib/LzmaCustomDecompressLib.inf + NULL|MdeModulePkg/Library/LzmaCustomDecompressLib/LzmaCustomDecompressLib.inf DevicePathLib|MdePkg/Library/UefiDevicePathLib/UefiDevicePathLib.inf } diff --git a/QuarkSocPkg/QuarkSocPkg.dsc b/QuarkSocPkg/QuarkSocPkg.dsc index 42bb5bb..9e37a0b 100644 --- a/QuarkSocPkg/QuarkSocPkg.dsc +++ b/QuarkSocPkg/QuarkSocPkg.dsc @@ -116,7 +116,7 @@ # # Misc # - DebugLib|IntelFrameworkModulePkg/Library/PeiDxeDebugLibReportStatusCode/PeiDxeDebugLibReportStatusCode.inf + DebugLib|MdeModulePkg/Library/PeiDxeDebugLibReportStatusCode/PeiDxeDebugLibReportStatusCode.inf DebugPrintErrorLevelLib|MdePkg/Library/BaseDebugPrintErrorLevelLib/BaseDebugPrintErrorLevelLib.inf PerformanceLib|MdePkg/Library/BasePerformanceLibNull/BasePerformanceLibNull.inf PcdLib|MdePkg/Library/BasePcdLibNull/BasePcdLibNull.inf diff --git a/Vlv2TbltDevicePkg/PlatformPkgGccX64.dsc b/Vlv2TbltDevicePkg/PlatformPkgGccX64.dsc index c3dc25f..9da6c97 100644 --- a/Vlv2TbltDevicePkg/PlatformPkgGccX64.dsc +++ b/Vlv2TbltDevicePkg/PlatformPkgGccX64.dsc @@ -1064,7 +1064,7 @@ $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)$(TARGET)/IA32/fTPMInitPeim.inf MdeModulePkg/Core/DxeIplPeim/DxeIpl.inf { <LibraryClasses> !if $(LZMA_ENABLE) == TRUE - NULL|IntelFrameworkModulePkg/Library/LzmaCustomDecompressLib/LzmaCustomDecompressLib.inf + NULL|MdeModulePkg/Library/LzmaCustomDecompressLib/LzmaCustomDecompressLib.inf !endif } @@ -1121,7 +1121,7 @@ $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)$(TARGET)/IA32/fTPMInitPeim.inf NULL|MdeModulePkg/Library/DxeCrc32GuidedSectionExtractLib/DxeCrc32GuidedSectionExtractLib.inf !endif !if $(LZMA_ENABLE) == TRUE - NULL|IntelFrameworkModulePkg/Library/LzmaCustomDecompressLib/LzmaCustomDecompressLib.inf + NULL|MdeModulePkg/Library/LzmaCustomDecompressLib/LzmaCustomDecompressLib.inf !endif !if $(TARGET) != RELEASE DebugLib|MdePkg/Library/BaseDebugLibSerialPort/BaseDebugLibSerialPort.inf diff --git a/Vlv2TbltDevicePkg/PlatformPkgIA32.dsc b/Vlv2TbltDevicePkg/PlatformPkgIA32.dsc index 3a5776a..556e4cf 100644 --- a/Vlv2TbltDevicePkg/PlatformPkgIA32.dsc +++ b/Vlv2TbltDevicePkg/PlatformPkgIA32.dsc @@ -332,7 +332,7 @@ DebugLib|MdePkg/Library/BaseDebugLibNull/BaseDebugLibNull.inf SerialPortLib|MdePkg/Library/BaseSerialPortLibNull/BaseSerialPortLibNull.inf !else - DebugLib|IntelFrameworkModulePkg/Library/PeiDxeDebugLibReportStatusCode/PeiDxeDebugLibReportStatusCode.inf + DebugLib|MdeModulePkg/Library/PeiDxeDebugLibReportStatusCode/PeiDxeDebugLibReportStatusCode.inf SerialPortLib|$(PLATFORM_PACKAGE)/Library/SerialPortLib/SerialPortLib.inf !endif @@ -1058,7 +1058,7 @@ $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)$(TARGET)/IA32/fTPMInitPeim.inf MdeModulePkg/Core/DxeIplPeim/DxeIpl.inf { <LibraryClasses> !if $(LZMA_ENABLE) == TRUE - NULL|IntelFrameworkModulePkg/Library/LzmaCustomDecompressLib/LzmaCustomDecompressLib.inf + NULL|MdeModulePkg/Library/LzmaCustomDecompressLib/LzmaCustomDecompressLib.inf !endif } @@ -1115,7 +1115,7 @@ $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)$(TARGET)/IA32/fTPMInitPeim.inf NULL|MdeModulePkg/Library/DxeCrc32GuidedSectionExtractLib/DxeCrc32GuidedSectionExtractLib.inf !endif !if $(LZMA_ENABLE) == TRUE - NULL|IntelFrameworkModulePkg/Library/LzmaCustomDecompressLib/LzmaCustomDecompressLib.inf + NULL|MdeModulePkg/Library/LzmaCustomDecompressLib/LzmaCustomDecompressLib.inf !endif !if $(TARGET) != RELEASE DebugLib|MdePkg/Library/BaseDebugLibSerialPort/BaseDebugLibSerialPort.inf diff --git a/Vlv2TbltDevicePkg/PlatformPkgX64.dsc b/Vlv2TbltDevicePkg/PlatformPkgX64.dsc index 83cbb0a..4f08ad4 100644 --- a/Vlv2TbltDevicePkg/PlatformPkgX64.dsc +++ b/Vlv2TbltDevicePkg/PlatformPkgX64.dsc @@ -332,7 +332,7 @@ DebugLib|MdePkg/Library/BaseDebugLibNull/BaseDebugLibNull.inf SerialPortLib|MdePkg/Library/BaseSerialPortLibNull/BaseSerialPortLibNull.inf !else - DebugLib|IntelFrameworkModulePkg/Library/PeiDxeDebugLibReportStatusCode/PeiDxeDebugLibReportStatusCode.inf + DebugLib|MdeModulePkg/Library/PeiDxeDebugLibReportStatusCode/PeiDxeDebugLibReportStatusCode.inf SerialPortLib|$(PLATFORM_PACKAGE)/Library/SerialPortLib/SerialPortLib.inf !endif @@ -1058,7 +1058,7 @@ $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)$(TARGET)/IA32/fTPMInitPeim.inf MdeModulePkg/Core/DxeIplPeim/DxeIpl.inf { <LibraryClasses> !if $(LZMA_ENABLE) == TRUE - NULL|IntelFrameworkModulePkg/Library/LzmaCustomDecompressLib/LzmaCustomDecompressLib.inf + NULL|MdeModulePkg/Library/LzmaCustomDecompressLib/LzmaCustomDecompressLib.inf !endif } @@ -1115,7 +1115,7 @@ $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)$(TARGET)/IA32/fTPMInitPeim.inf NULL|MdeModulePkg/Library/DxeCrc32GuidedSectionExtractLib/DxeCrc32GuidedSectionExtractLib.inf !endif !if $(LZMA_ENABLE) == TRUE - NULL|IntelFrameworkModulePkg/Library/LzmaCustomDecompressLib/LzmaCustomDecompressLib.inf + NULL|MdeModulePkg/Library/LzmaCustomDecompressLib/LzmaCustomDecompressLib.inf !endif !if $(TARGET) != RELEASE DebugLib|MdePkg/Library/BaseDebugLibSerialPort/BaseDebugLibSerialPort.inf
LzmaCustomDecompressLib and PeiDxeDebugLibReportStatusCode were copied from IntelFrameworkModulePkg to MdeModulePkg, but the originals were kept for compatibility. Nevertheless, new code should be using the MdeModulePkg versions, so change all references in in-tree platforms. Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: Leif Lindholm <leif.lindholm@linaro.org> --- BeagleBoardPkg/BeagleBoardPkg.dsc | 4 ++-- DuetPkg/DuetPkgIa32.dsc | 4 ++-- DuetPkg/DuetPkgX64.dsc | 4 ++-- EmbeddedPkg/EmbeddedPkg.dsc | 2 +- EmulatorPkg/EmulatorPkg.dsc | 4 ++-- IntelFrameworkModulePkg/IntelFrameworkModulePkg.dsc | 6 +++--- OvmfPkg/OvmfPkgIa32.dsc | 4 ++-- OvmfPkg/OvmfPkgIa32X64.dsc | 4 ++-- OvmfPkg/OvmfPkgX64.dsc | 4 ++-- QuarkSocPkg/QuarkSocPkg.dsc | 2 +- Vlv2TbltDevicePkg/PlatformPkgGccX64.dsc | 4 ++-- Vlv2TbltDevicePkg/PlatformPkgIA32.dsc | 6 +++--- Vlv2TbltDevicePkg/PlatformPkgX64.dsc | 6 +++--- 13 files changed, 27 insertions(+), 27 deletions(-) -- 2.10.2 _______________________________________________ edk2-devel mailing list edk2-devel@lists.01.org https://lists.01.org/mailman/listinfo/edk2-devel