<?xml version="1.0" encoding="UTF-8"?>\r
-<PackageSurfaceArea xsi:schemaLocation="http://www.TianoCore.org/2006/Edk2.0 http://www.TianoCore.org/2006/Edk2.0/SurfaceArea.xsd" xmlns="http://www.TianoCore.org/2006/Edk2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">\r
+<PackageSurfaceArea xmlns="http://www.TianoCore.org/2006/Edk2.0">\r
<SpdHeader>\r
<PackageName>MdePkg</PackageName>\r
<GuidValue>5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec</GuidValue>\r
<Filename>Library/UefiDriverEntryPoint/UefiDriverEntryPoint.msa</Filename>\r
<Filename>Library/UefiDriverModelLib/UefiDriverModelLib.msa</Filename>\r
<Filename>Library/UefiLib/UefiLib.msa</Filename>\r
- <Filename>Library/UefiMemoryLib/UefiMemoryLib.msa</Filename>\r
+ <Filename>Library/DxeMemoryLib/DxeMemoryLib.msa</Filename>\r
<Filename>Library/UefiRuntimeServicesTableLib/UefiRuntimeServicesTableLib.msa</Filename>\r
</MsaFiles>\r
<PackageHeaders>\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
+ <C_Name>gEfiMdePkgTokenSpaceGuid</C_Name>\r
+ <GuidValue>914AEBE7-4635-459b-AA1C-11E219B03A10</GuidValue>\r
+ <HelpText>All PCD define in MdePkg is in this token space scope</HelpText>\r
+ </Entry>\r
<Entry Name="Acpi10Table">\r
<C_Name>gEfiAcpi10TableGuid</C_Name>\r
<GuidValue>EB9D2D30-2D88-11D3-9A16-0090273FC14D</GuidValue>\r
<GuidValue>A6A72875-2962-4C18-9F46-8DA644CCFE00</GuidValue>\r
<HelpText/>\r
</Entry>\r
- <Entry Name="ScsiIo">\r
+ <Entry Name="ScsiIoExt">\r
<C_Name>gEfiScsiIoProtocolGuid</C_Name>\r
<GuidValue>932F4736-2362-4002-803E-3CD54B138F85</GuidValue>\r
<HelpText/>\r