<?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>EdkModulePkg</PackageName>\r
<GuidValue>B6EC423C-21D2-490D-85C6-DD5864EAA674</GuidValue>\r
<IncludePkgHeader ModuleType="DXE_SMM_DRIVER">Include/EdkDxe.h</IncludePkgHeader>\r
<IncludePkgHeader ModuleType="DXE_SAL_DRIVER">Include/EdkDxe.h</IncludePkgHeader>\r
<IncludePkgHeader ModuleType="UEFI_DRIVER">Include/EdkDxe.h</IncludePkgHeader>\r
+ <IncludePkgHeader ModuleType="USER_DEFINED">Include/EdkPeim.h</IncludePkgHeader>\r
</PackageHeaders>\r
<GuidDeclarations>\r
+ <Entry Name="EdkModulePkgTokenSpace">\r
+ <C_Name>gEfiEdkModulePkgTokenSpaceGuid</C_Name>\r
+ <GuidValue>8CC4092F-F60E-46d1-B41C-1E761DF50582</GuidValue>\r
+ <HelpText>All PCD define in EdkModulePkg is in this token space scope</HelpText>\r
+ </Entry> \r
<Entry Name="PcdDataBaseHob">\r
<C_Name>gPcdDataBaseHobGuid</C_Name>\r
<GuidValue>EA296D92-0B69-423C-8C28-33B4E0A91268</GuidValue>\r