-<?xml version="1.0" encoding="UTF-8"?>\r
+<?xml version="1.0" encoding="UTF-8"?>\r
<PackageSurfaceArea xmlns="http://www.TianoCore.org/2006/Edk2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">\r
<SpdHeader>\r
<PackageName>MdePkg</PackageName>\r
<Filename>Library/BasePciExpressLib/BasePciExpressLib.msa</Filename>\r
<Filename>Library/BasePciLibCf8/BasePciLibCf8.msa</Filename>\r
<Filename>Library/BasePciLibPciExpress/BasePciLibPciExpress.msa</Filename>\r
- <Filename>Library/BaseTimerLibLocalApic/BaseTimerLibLocalApic.msa</Filename>\r
<Filename>Library/DxeCoreEntryPoint/DxeCoreEntryPoint.msa</Filename>\r
<Filename>Library/DxeCoreHobLib/DxeCoreHobLib.msa</Filename>\r
<Filename>Library/DxeHobLib/DxeHobLib.msa</Filename>\r
<Filename>Library/DxeMemoryLib/DxeMemoryLib.msa</Filename>\r
<Filename>Library/UefiRuntimeServicesTableLib/UefiRuntimeServicesTableLib.msa</Filename>\r
<Filename>Library/UefiApplicationEntryPoint/UefiApplicationEntryPoint.msa</Filename>\r
+ <Filename>Library/BaseTimerLibNullTemplate/BaseTimerLibNullTemplate.msa</Filename>\r
+ <Filename>Library/SecPeiDxeTimerLibCpu/SecPeiDxeTimerLibCpu.msa</Filename>\r
</MsaFiles>\r
<PackageHeaders>\r
<IncludePkgHeader ModuleType="BASE">Include/Base.h</IncludePkgHeader>\r
<IncludePkgHeader ModuleType="DXE_SAL_DRIVER">Include/Dxe.h</IncludePkgHeader>\r
<IncludePkgHeader ModuleType="UEFI_DRIVER">Include/Uefi.h</IncludePkgHeader>\r
<IncludePkgHeader ModuleType="UEFI_APPLICATION">Include/Uefi.h</IncludePkgHeader>\r
- <IncludePkgHeader ModuleType="USER_DEFINED">Include/Peim.h</IncludePkgHeader>\r
</PackageHeaders>\r
<GuidDeclarations>\r
<Entry Name="MdePkgTokenSpace">\r