On 2014-11-08 14:02:01, Gabriel L. Somlo wrote: > Link DXE_SMM_DRIVER, UEFI_DRIVER, UEFI_APPLICATION, and SMM_CORE against > a valid, non-asserting version of PcdLib, then switch them over to using > the "Dxe" instance of AcpiTimerLib (instead of the "Base" version). > > Contributed-under: TianoCore Contribution Agreement 1.0 > Signed-off-by: Gabriel Somlo <so...@cmu.edu> > --- > OvmfPkg/Library/AcpiTimerLib/BaseAcpiTimerLib.inf | 2 +- > OvmfPkg/Library/AcpiTimerLib/DxeAcpiTimerLib.inf | 2 +- > OvmfPkg/OvmfPkgIa32.dsc | 17 +++++++++-------- > OvmfPkg/OvmfPkgIa32X64.dsc | 17 +++++++++-------- > OvmfPkg/OvmfPkgX64.dsc | 17 +++++++++-------- > 5 files changed, 29 insertions(+), 26 deletions(-) > > diff --git a/OvmfPkg/Library/AcpiTimerLib/BaseAcpiTimerLib.inf > b/OvmfPkg/Library/AcpiTimerLib/BaseAcpiTimerLib.inf > index 43ffc8a..4c0e615 100644 > --- a/OvmfPkg/Library/AcpiTimerLib/BaseAcpiTimerLib.inf > +++ b/OvmfPkg/Library/AcpiTimerLib/BaseAcpiTimerLib.inf > @@ -20,7 +20,7 @@ > FILE_GUID = FB648CF5-91BE-4737-9023-FD807AC6D96D > MODULE_TYPE = BASE > VERSION_STRING = 1.0 > - LIBRARY_CLASS = TimerLib|PEI_CORE PEIM DXE_CORE DXE_SMM_DRIVER > UEFI_DRIVER UEFI_APPLICATION SMM_CORE > + LIBRARY_CLASS = TimerLib|PEI_CORE PEIM DXE_CORE > CONSTRUCTOR = AcpiTimerLibConstructor > > [Sources] > diff --git a/OvmfPkg/Library/AcpiTimerLib/DxeAcpiTimerLib.inf > b/OvmfPkg/Library/AcpiTimerLib/DxeAcpiTimerLib.inf > index b7e8bfc..25a9823 100644 > --- a/OvmfPkg/Library/AcpiTimerLib/DxeAcpiTimerLib.inf > +++ b/OvmfPkg/Library/AcpiTimerLib/DxeAcpiTimerLib.inf > @@ -20,7 +20,7 @@ > FILE_GUID = 52DECA02-2EE8-4EAA-8EAD-1AB83F8A5955 > MODULE_TYPE = BASE > VERSION_STRING = 1.0 > - LIBRARY_CLASS = TimerLib|DXE_DRIVER DXE_RUNTIME_DRIVER > + LIBRARY_CLASS = TimerLib|DXE_DRIVER DXE_RUNTIME_DRIVER DXE_SMM_DRIVER > UEFI_DRIVER UEFI_APPLICATION SMM_CORE > CONSTRUCTOR = AcpiTimerLibConstructor > > [Sources] > diff --git a/OvmfPkg/OvmfPkgIa32.dsc b/OvmfPkg/OvmfPkgIa32.dsc > index cd7e252..bd01616 100644 > --- a/OvmfPkg/OvmfPkgIa32.dsc > +++ b/OvmfPkg/OvmfPkgIa32.dsc > @@ -56,8 +56,8 @@ > # > > ################################################################################ > [LibraryClasses] > - PcdLib|MdePkg/Library/BasePcdLibNull/BasePcdLibNull.inf > - TimerLib|OvmfPkg/Library/AcpiTimerLib/BaseAcpiTimerLib.inf > + PcdLib|MdePkg/Library/BasePcdLibNull/DxePcdLib.inf > + TimerLib|OvmfPkg/Library/AcpiTimerLib/DxeAcpiTimerLib.inf
I don't think we should change these 2 default mappings. The old ones seem like better 'default' mappings. Can you change it for each module type as needed instead? -Jordan > PrintLib|MdePkg/Library/BasePrintLib/BasePrintLib.inf > BaseMemoryLib|MdePkg/Library/BaseMemoryLibRepStr/BaseMemoryLibRepStr.inf > BaseLib|MdePkg/Library/BaseLib/BaseLib.inf > @@ -131,6 +131,7 @@ > !endif > > [LibraryClasses.common.SEC] > + PcdLib|MdePkg/Library/BasePcdLibNull/BasePcdLibNull.inf > TimerLib|OvmfPkg/Library/AcpiTimerLib/BaseRomAcpiTimerLib.inf > QemuFwCfgLib|OvmfPkg/Library/QemuFwCfgLib/QemuFwCfgSecLib.inf > !ifdef $(DEBUG_ON_SERIAL_PORT) > @@ -150,6 +151,8 @@ > > CpuExceptionHandlerLib|UefiCpuPkg/Library/CpuExceptionHandlerLib/SecPeiCpuExceptionHandlerLib.inf > > [LibraryClasses.common.PEI_CORE] > + PcdLib|MdePkg/Library/BasePcdLibNull/BasePcdLibNull.inf > + TimerLib|OvmfPkg/Library/AcpiTimerLib/BaseAcpiTimerLib.inf > HobLib|MdePkg/Library/PeiHobLib/PeiHobLib.inf > > PeiServicesTablePointerLib|MdePkg/Library/PeiServicesTablePointerLibIdt/PeiServicesTablePointerLibIdt.inf > PeiServicesLib|MdePkg/Library/PeiServicesLib/PeiServicesLib.inf > @@ -166,6 +169,8 @@ > PeCoffLib|MdePkg/Library/BasePeCoffLib/BasePeCoffLib.inf > > [LibraryClasses.common.PEIM] > + PcdLib|MdePkg/Library/BasePcdLibNull/BasePcdLibNull.inf > + TimerLib|OvmfPkg/Library/AcpiTimerLib/BaseAcpiTimerLib.inf > HobLib|MdePkg/Library/PeiHobLib/PeiHobLib.inf > > PeiServicesTablePointerLib|MdePkg/Library/PeiServicesTablePointerLibIdt/PeiServicesTablePointerLibIdt.inf > PeiServicesLib|MdePkg/Library/PeiServicesLib/PeiServicesLib.inf > @@ -187,6 +192,8 @@ > !endif > > [LibraryClasses.common.DXE_CORE] > + PcdLib|MdePkg/Library/BasePcdLibNull/BasePcdLibNull.inf > + TimerLib|OvmfPkg/Library/AcpiTimerLib/BaseAcpiTimerLib.inf > HobLib|MdePkg/Library/DxeCoreHobLib/DxeCoreHobLib.inf > DxeCoreEntryPoint|MdePkg/Library/DxeCoreEntryPoint/DxeCoreEntryPoint.inf > > MemoryAllocationLib|MdeModulePkg/Library/DxeCoreMemoryAllocationLib/DxeCoreMemoryAllocationLib.inf > @@ -196,7 +203,6 @@ > !else > DebugLib|OvmfPkg/Library/PlatformDebugLibIoPort/PlatformDebugLibIoPort.inf > !endif > - PcdLib|MdePkg/Library/BasePcdLibNull/BasePcdLibNull.inf > > ExtractGuidedSectionLib|MdePkg/Library/DxeExtractGuidedSectionLib/DxeExtractGuidedSectionLib.inf > !ifdef $(SOURCE_DEBUG_ENABLE) > DebugAgentLib|SourceLevelDebugPkg/Library/DebugAgent/DxeDebugAgentLib.inf > @@ -204,7 +210,6 @@ > > CpuExceptionHandlerLib|UefiCpuPkg/Library/CpuExceptionHandlerLib/DxeCpuExceptionHandlerLib.inf > > [LibraryClasses.common.DXE_RUNTIME_DRIVER] > - TimerLib|OvmfPkg/Library/AcpiTimerLib/DxeAcpiTimerLib.inf > HobLib|MdePkg/Library/DxeHobLib/DxeHobLib.inf > DxeCoreEntryPoint|MdePkg/Library/DxeCoreEntryPoint/DxeCoreEntryPoint.inf > > MemoryAllocationLib|MdePkg/Library/UefiMemoryAllocationLib/UefiMemoryAllocationLib.inf > @@ -214,7 +219,6 @@ > !else > DebugLib|OvmfPkg/Library/PlatformDebugLibIoPort/PlatformDebugLibIoPort.inf > !endif > - PcdLib|MdePkg/Library/DxePcdLib/DxePcdLib.inf > UefiRuntimeLib|MdePkg/Library/UefiRuntimeLib/UefiRuntimeLib.inf > !if $(SECURE_BOOT_ENABLE) == TRUE > BaseCryptLib|CryptoPkg/Library/BaseCryptLib/RuntimeCryptLib.inf > @@ -230,13 +234,10 @@ > !else > DebugLib|OvmfPkg/Library/PlatformDebugLibIoPort/PlatformDebugLibIoPort.inf > !endif > - PcdLib|MdePkg/Library/BasePcdLibNull/BasePcdLibNull.inf > UefiScsiLib|MdePkg/Library/UefiScsiLib/UefiScsiLib.inf > > [LibraryClasses.common.DXE_DRIVER] > - TimerLib|OvmfPkg/Library/AcpiTimerLib/DxeAcpiTimerLib.inf > HobLib|MdePkg/Library/DxeHobLib/DxeHobLib.inf > - PcdLib|MdePkg/Library/DxePcdLib/DxePcdLib.inf > > MemoryAllocationLib|MdePkg/Library/UefiMemoryAllocationLib/UefiMemoryAllocationLib.inf > > ReportStatusCodeLib|MdeModulePkg/Library/DxeReportStatusCodeLib/DxeReportStatusCodeLib.inf > UefiScsiLib|MdePkg/Library/UefiScsiLib/UefiScsiLib.inf > diff --git a/OvmfPkg/OvmfPkgIa32X64.dsc b/OvmfPkg/OvmfPkgIa32X64.dsc > index 16f988b..95058c8 100644 > --- a/OvmfPkg/OvmfPkgIa32X64.dsc > +++ b/OvmfPkg/OvmfPkgIa32X64.dsc > @@ -61,8 +61,8 @@ > # > > ################################################################################ > [LibraryClasses] > - PcdLib|MdePkg/Library/BasePcdLibNull/BasePcdLibNull.inf > - TimerLib|OvmfPkg/Library/AcpiTimerLib/BaseAcpiTimerLib.inf > + PcdLib|MdePkg/Library/BasePcdLibNull/DxePcdLib.inf > + TimerLib|OvmfPkg/Library/AcpiTimerLib/DxeAcpiTimerLib.inf > PrintLib|MdePkg/Library/BasePrintLib/BasePrintLib.inf > BaseMemoryLib|MdePkg/Library/BaseMemoryLibRepStr/BaseMemoryLibRepStr.inf > BaseLib|MdePkg/Library/BaseLib/BaseLib.inf > @@ -136,6 +136,7 @@ > !endif > > [LibraryClasses.common.SEC] > + PcdLib|MdePkg/Library/BasePcdLibNull/BasePcdLibNull.inf > TimerLib|OvmfPkg/Library/AcpiTimerLib/BaseRomAcpiTimerLib.inf > QemuFwCfgLib|OvmfPkg/Library/QemuFwCfgLib/QemuFwCfgSecLib.inf > !ifdef $(DEBUG_ON_SERIAL_PORT) > @@ -155,6 +156,8 @@ > > CpuExceptionHandlerLib|UefiCpuPkg/Library/CpuExceptionHandlerLib/SecPeiCpuExceptionHandlerLib.inf > > [LibraryClasses.common.PEI_CORE] > + PcdLib|MdePkg/Library/BasePcdLibNull/BasePcdLibNull.inf > + TimerLib|OvmfPkg/Library/AcpiTimerLib/BaseAcpiTimerLib.inf > HobLib|MdePkg/Library/PeiHobLib/PeiHobLib.inf > > PeiServicesTablePointerLib|MdePkg/Library/PeiServicesTablePointerLibIdt/PeiServicesTablePointerLibIdt.inf > PeiServicesLib|MdePkg/Library/PeiServicesLib/PeiServicesLib.inf > @@ -171,6 +174,8 @@ > PeCoffLib|MdePkg/Library/BasePeCoffLib/BasePeCoffLib.inf > > [LibraryClasses.common.PEIM] > + PcdLib|MdePkg/Library/BasePcdLibNull/BasePcdLibNull.inf > + TimerLib|OvmfPkg/Library/AcpiTimerLib/BaseAcpiTimerLib.inf > HobLib|MdePkg/Library/PeiHobLib/PeiHobLib.inf > > PeiServicesTablePointerLib|MdePkg/Library/PeiServicesTablePointerLibIdt/PeiServicesTablePointerLibIdt.inf > PeiServicesLib|MdePkg/Library/PeiServicesLib/PeiServicesLib.inf > @@ -192,6 +197,8 @@ > !endif > > [LibraryClasses.common.DXE_CORE] > + PcdLib|MdePkg/Library/BasePcdLibNull/BasePcdLibNull.inf > + TimerLib|OvmfPkg/Library/AcpiTimerLib/BaseAcpiTimerLib.inf > HobLib|MdePkg/Library/DxeCoreHobLib/DxeCoreHobLib.inf > DxeCoreEntryPoint|MdePkg/Library/DxeCoreEntryPoint/DxeCoreEntryPoint.inf > > MemoryAllocationLib|MdeModulePkg/Library/DxeCoreMemoryAllocationLib/DxeCoreMemoryAllocationLib.inf > @@ -201,7 +208,6 @@ > !else > DebugLib|OvmfPkg/Library/PlatformDebugLibIoPort/PlatformDebugLibIoPort.inf > !endif > - PcdLib|MdePkg/Library/BasePcdLibNull/BasePcdLibNull.inf > > ExtractGuidedSectionLib|MdePkg/Library/DxeExtractGuidedSectionLib/DxeExtractGuidedSectionLib.inf > !ifdef $(SOURCE_DEBUG_ENABLE) > DebugAgentLib|SourceLevelDebugPkg/Library/DebugAgent/DxeDebugAgentLib.inf > @@ -209,7 +215,6 @@ > > CpuExceptionHandlerLib|UefiCpuPkg/Library/CpuExceptionHandlerLib/DxeCpuExceptionHandlerLib.inf > > [LibraryClasses.common.DXE_RUNTIME_DRIVER] > - TimerLib|OvmfPkg/Library/AcpiTimerLib/DxeAcpiTimerLib.inf > HobLib|MdePkg/Library/DxeHobLib/DxeHobLib.inf > DxeCoreEntryPoint|MdePkg/Library/DxeCoreEntryPoint/DxeCoreEntryPoint.inf > > MemoryAllocationLib|MdePkg/Library/UefiMemoryAllocationLib/UefiMemoryAllocationLib.inf > @@ -219,7 +224,6 @@ > !else > DebugLib|OvmfPkg/Library/PlatformDebugLibIoPort/PlatformDebugLibIoPort.inf > !endif > - PcdLib|MdePkg/Library/DxePcdLib/DxePcdLib.inf > UefiRuntimeLib|MdePkg/Library/UefiRuntimeLib/UefiRuntimeLib.inf > !if $(SECURE_BOOT_ENABLE) == TRUE > BaseCryptLib|CryptoPkg/Library/BaseCryptLib/RuntimeCryptLib.inf > @@ -235,13 +239,10 @@ > !else > DebugLib|OvmfPkg/Library/PlatformDebugLibIoPort/PlatformDebugLibIoPort.inf > !endif > - PcdLib|MdePkg/Library/BasePcdLibNull/BasePcdLibNull.inf > UefiScsiLib|MdePkg/Library/UefiScsiLib/UefiScsiLib.inf > > [LibraryClasses.common.DXE_DRIVER] > - TimerLib|OvmfPkg/Library/AcpiTimerLib/DxeAcpiTimerLib.inf > HobLib|MdePkg/Library/DxeHobLib/DxeHobLib.inf > - PcdLib|MdePkg/Library/DxePcdLib/DxePcdLib.inf > > MemoryAllocationLib|MdePkg/Library/UefiMemoryAllocationLib/UefiMemoryAllocationLib.inf > > ReportStatusCodeLib|MdeModulePkg/Library/DxeReportStatusCodeLib/DxeReportStatusCodeLib.inf > UefiScsiLib|MdePkg/Library/UefiScsiLib/UefiScsiLib.inf > diff --git a/OvmfPkg/OvmfPkgX64.dsc b/OvmfPkg/OvmfPkgX64.dsc > index b70985b..3c12517 100644 > --- a/OvmfPkg/OvmfPkgX64.dsc > +++ b/OvmfPkg/OvmfPkgX64.dsc > @@ -61,8 +61,8 @@ > # > > ################################################################################ > [LibraryClasses] > - PcdLib|MdePkg/Library/BasePcdLibNull/BasePcdLibNull.inf > - TimerLib|OvmfPkg/Library/AcpiTimerLib/BaseAcpiTimerLib.inf > + PcdLib|MdePkg/Library/DxePcdLib/DxePcdLib.inf > + TimerLib|OvmfPkg/Library/AcpiTimerLib/DxeAcpiTimerLib.inf > PrintLib|MdePkg/Library/BasePrintLib/BasePrintLib.inf > BaseMemoryLib|MdePkg/Library/BaseMemoryLibRepStr/BaseMemoryLibRepStr.inf > BaseLib|MdePkg/Library/BaseLib/BaseLib.inf > @@ -136,6 +136,7 @@ > !endif > > [LibraryClasses.common.SEC] > + PcdLib|MdePkg/Library/BasePcdLibNull/BasePcdLibNull.inf > TimerLib|OvmfPkg/Library/AcpiTimerLib/BaseRomAcpiTimerLib.inf > QemuFwCfgLib|OvmfPkg/Library/QemuFwCfgLib/QemuFwCfgSecLib.inf > !ifdef $(DEBUG_ON_SERIAL_PORT) > @@ -155,6 +156,8 @@ > > CpuExceptionHandlerLib|UefiCpuPkg/Library/CpuExceptionHandlerLib/SecPeiCpuExceptionHandlerLib.inf > > [LibraryClasses.common.PEI_CORE] > + PcdLib|MdePkg/Library/BasePcdLibNull/BasePcdLibNull.inf > + TimerLib|OvmfPkg/Library/AcpiTimerLib/BaseAcpiTimerLib.inf > HobLib|MdePkg/Library/PeiHobLib/PeiHobLib.inf > > PeiServicesTablePointerLib|MdePkg/Library/PeiServicesTablePointerLibIdt/PeiServicesTablePointerLibIdt.inf > PeiServicesLib|MdePkg/Library/PeiServicesLib/PeiServicesLib.inf > @@ -171,6 +174,8 @@ > PeCoffLib|MdePkg/Library/BasePeCoffLib/BasePeCoffLib.inf > > [LibraryClasses.common.PEIM] > + PcdLib|MdePkg/Library/BasePcdLibNull/BasePcdLibNull.inf > + TimerLib|OvmfPkg/Library/AcpiTimerLib/BaseAcpiTimerLib.inf > HobLib|MdePkg/Library/PeiHobLib/PeiHobLib.inf > > PeiServicesTablePointerLib|MdePkg/Library/PeiServicesTablePointerLibIdt/PeiServicesTablePointerLibIdt.inf > PeiServicesLib|MdePkg/Library/PeiServicesLib/PeiServicesLib.inf > @@ -192,6 +197,8 @@ > !endif > > [LibraryClasses.common.DXE_CORE] > + PcdLib|MdePkg/Library/BasePcdLibNull/BasePcdLibNull.inf > + TimerLib|OvmfPkg/Library/AcpiTimerLib/BaseAcpiTimerLib.inf > HobLib|MdePkg/Library/DxeCoreHobLib/DxeCoreHobLib.inf > DxeCoreEntryPoint|MdePkg/Library/DxeCoreEntryPoint/DxeCoreEntryPoint.inf > > MemoryAllocationLib|MdeModulePkg/Library/DxeCoreMemoryAllocationLib/DxeCoreMemoryAllocationLib.inf > @@ -201,7 +208,6 @@ > !else > DebugLib|OvmfPkg/Library/PlatformDebugLibIoPort/PlatformDebugLibIoPort.inf > !endif > - PcdLib|MdePkg/Library/BasePcdLibNull/BasePcdLibNull.inf > > ExtractGuidedSectionLib|MdePkg/Library/DxeExtractGuidedSectionLib/DxeExtractGuidedSectionLib.inf > !ifdef $(SOURCE_DEBUG_ENABLE) > DebugAgentLib|SourceLevelDebugPkg/Library/DebugAgent/DxeDebugAgentLib.inf > @@ -209,7 +215,6 @@ > > CpuExceptionHandlerLib|UefiCpuPkg/Library/CpuExceptionHandlerLib/DxeCpuExceptionHandlerLib.inf > > [LibraryClasses.common.DXE_RUNTIME_DRIVER] > - TimerLib|OvmfPkg/Library/AcpiTimerLib/DxeAcpiTimerLib.inf > HobLib|MdePkg/Library/DxeHobLib/DxeHobLib.inf > DxeCoreEntryPoint|MdePkg/Library/DxeCoreEntryPoint/DxeCoreEntryPoint.inf > > MemoryAllocationLib|MdePkg/Library/UefiMemoryAllocationLib/UefiMemoryAllocationLib.inf > @@ -219,7 +224,6 @@ > !else > DebugLib|OvmfPkg/Library/PlatformDebugLibIoPort/PlatformDebugLibIoPort.inf > !endif > - PcdLib|MdePkg/Library/DxePcdLib/DxePcdLib.inf > UefiRuntimeLib|MdePkg/Library/UefiRuntimeLib/UefiRuntimeLib.inf > !if $(SECURE_BOOT_ENABLE) == TRUE > BaseCryptLib|CryptoPkg/Library/BaseCryptLib/RuntimeCryptLib.inf > @@ -235,13 +239,10 @@ > !else > DebugLib|OvmfPkg/Library/PlatformDebugLibIoPort/PlatformDebugLibIoPort.inf > !endif > - PcdLib|MdePkg/Library/BasePcdLibNull/BasePcdLibNull.inf > UefiScsiLib|MdePkg/Library/UefiScsiLib/UefiScsiLib.inf > > [LibraryClasses.common.DXE_DRIVER] > - TimerLib|OvmfPkg/Library/AcpiTimerLib/DxeAcpiTimerLib.inf > HobLib|MdePkg/Library/DxeHobLib/DxeHobLib.inf > - PcdLib|MdePkg/Library/DxePcdLib/DxePcdLib.inf > > MemoryAllocationLib|MdePkg/Library/UefiMemoryAllocationLib/UefiMemoryAllocationLib.inf > > ReportStatusCodeLib|MdeModulePkg/Library/DxeReportStatusCodeLib/DxeReportStatusCodeLib.inf > UefiScsiLib|MdePkg/Library/UefiScsiLib/UefiScsiLib.inf > -- > 1.9.3 > > > ------------------------------------------------------------------------------ > _______________________________________________ > edk2-devel mailing list > edk2-devel@lists.sourceforge.net > https://lists.sourceforge.net/lists/listinfo/edk2-devel ------------------------------------------------------------------------------ _______________________________________________ edk2-devel mailing list edk2-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/edk2-devel
