X-Git-Url: https://git.proxmox.com/?p=mirror_edk2.git;a=blobdiff_plain;f=MdePkg%2FMdePkg.spd;h=118b30b7019067778ea7c895cef3e6f76e1978a9;hp=964ced519d01bf67db1a48d788cc5434368c0980;hb=03e772c322f7364c4721e1bb4eb041ddb0d319e9;hpb=3bdeb048a5bced8277e4717854e38c4ce91a1cd3

diff --git a/MdePkg/MdePkg.spd b/MdePkg/MdePkg.spd
index 964ced519d..118b30b701 100644
--- a/MdePkg/MdePkg.spd
+++ b/MdePkg/MdePkg.spd
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<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">
+<PackageSurfaceArea xmlns="http://www.TianoCore.org/2006/Edk2.0">
   <SpdHeader>
     <PackageName>MdePkg</PackageName>
     <GuidValue>5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec</GuidValue>
@@ -237,7 +237,7 @@
     <Filename>Library/UefiDriverEntryPoint/UefiDriverEntryPoint.msa</Filename>
     <Filename>Library/UefiDriverModelLib/UefiDriverModelLib.msa</Filename>
     <Filename>Library/UefiLib/UefiLib.msa</Filename>
-    <Filename>Library/UefiMemoryLib/UefiMemoryLib.msa</Filename>
+    <Filename>Library/DxeMemoryLib/DxeMemoryLib.msa</Filename>
     <Filename>Library/UefiRuntimeServicesTableLib/UefiRuntimeServicesTableLib.msa</Filename>
   </MsaFiles>
   <PackageHeaders>
@@ -252,8 +252,14 @@
     <IncludePkgHeader ModuleType="DXE_SAL_DRIVER">Include/Dxe.h</IncludePkgHeader>
     <IncludePkgHeader ModuleType="UEFI_DRIVER">Include/Uefi.h</IncludePkgHeader>
     <IncludePkgHeader ModuleType="UEFI_APPLICATION">Include/Uefi.h</IncludePkgHeader>
+    <IncludePkgHeader ModuleType="USER_DEFINED">Include/Peim.h</IncludePkgHeader>
   </PackageHeaders>
   <GuidDeclarations>
+    <Entry Name="MdePkgTokenSpace">
+      <C_Name>gEfiMdePkgTokenSpaceGuid</C_Name>
+      <GuidValue>914AEBE7-4635-459b-AA1C-11E219B03A10</GuidValue>
+      <HelpText>All PCD define in MdePkg is in this token space scope</HelpText>
+    </Entry>
     <Entry Name="Acpi10Table">
       <C_Name>gEfiAcpi10TableGuid</C_Name>
       <GuidValue>EB9D2D30-2D88-11D3-9A16-0090273FC14D</GuidValue>
@@ -1016,7 +1022,7 @@
       <GuidValue>A6A72875-2962-4C18-9F46-8DA644CCFE00</GuidValue>
       <HelpText/>
     </Entry>
-    <Entry Name="ScsiIo">
+    <Entry Name="ScsiIoExt">
       <C_Name>gEfiScsiIoProtocolGuid</C_Name>
       <GuidValue>932F4736-2362-4002-803E-3CD54B138F85</GuidValue>
       <HelpText/>
@@ -1268,7 +1274,7 @@
     <PcdEntry>
       <C_Name>PcdMaximumUnicodeStringLength</C_Name>
       <Token>0x00000001</Token>
-      <TokenSpaceGuidCName>FIX_ME_PcdMaximumUnicodeStringLength</TokenSpaceGuidCName>
+      <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>
       <DatumType>UINT32</DatumType>
       <ValidUsage>FIXED_AT_BUILD</ValidUsage>
       <DefaultValue>1000000</DefaultValue>
@@ -1277,7 +1283,7 @@
     <PcdEntry>
       <C_Name>PcdMaximumAsciiStringLength</C_Name>
       <Token>0x00000002</Token>
-      <TokenSpaceGuidCName>FIX_ME_PcdMaximumAsciiStringLength</TokenSpaceGuidCName>
+      <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>
       <DatumType>UINT32</DatumType>
       <ValidUsage>FIXED_AT_BUILD</ValidUsage>
       <DefaultValue>1000000</DefaultValue>
@@ -1286,7 +1292,7 @@
     <PcdEntry>
       <C_Name>PcdMaximumLinkedListLength</C_Name>
       <Token>0x00000003</Token>
-      <TokenSpaceGuidCName>FIX_ME_PcdMaximumLinkedListLength</TokenSpaceGuidCName>
+      <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>
       <DatumType>UINT32</DatumType>
       <ValidUsage>FIXED_AT_BUILD</ValidUsage>
       <DefaultValue>1000000</DefaultValue>
@@ -1295,7 +1301,7 @@
     <PcdEntry>
       <C_Name>PcdSpinLockTimeout</C_Name>
       <Token>0x00000004</Token>
-      <TokenSpaceGuidCName>FIX_ME_PcdSpinLockTimeout</TokenSpaceGuidCName>
+      <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>
       <DatumType>UINT32</DatumType>
       <ValidUsage>FIXED_AT_BUILD</ValidUsage>
       <DefaultValue>10000000</DefaultValue>
@@ -1304,7 +1310,7 @@
     <PcdEntry>
       <C_Name>PcdDebugPropertyMask</C_Name>
       <Token>0x00000005</Token>
-      <TokenSpaceGuidCName>FIX_ME_PcdDebugPropertyMask</TokenSpaceGuidCName>
+      <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>
       <DatumType>UINT8</DatumType>
       <ValidUsage>FIXED_AT_BUILD</ValidUsage>
       <DefaultValue>0x0f</DefaultValue>
@@ -1313,7 +1319,7 @@
     <PcdEntry>
       <C_Name>PcdDebugPrintErrorLevel</C_Name>
       <Token>0x00000006</Token>
-      <TokenSpaceGuidCName>FIX_ME_PcdDebugPrintErrorLevel</TokenSpaceGuidCName>
+      <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>
       <DatumType>UINT32</DatumType>
       <ValidUsage>PATCHABLE_IN_MODULE</ValidUsage>
       <DefaultValue>0x80000000</DefaultValue>
@@ -1322,7 +1328,7 @@
     <PcdEntry>
       <C_Name>PcdReportStatusCodePropertyMask</C_Name>
       <Token>0x00000007</Token>
-      <TokenSpaceGuidCName>FIX_ME_PcdReportStatusCodePropertyMask</TokenSpaceGuidCName>
+      <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>
       <DatumType>UINT8</DatumType>
       <ValidUsage>FIXED_AT_BUILD</ValidUsage>
       <DefaultValue>0x07</DefaultValue>
@@ -1331,7 +1337,7 @@
     <PcdEntry>
       <C_Name>PcdDebugClearMemoryValue</C_Name>
       <Token>0x00000008</Token>
-      <TokenSpaceGuidCName>FIX_ME_PcdDebugClearMemoryValue</TokenSpaceGuidCName>
+      <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>
       <DatumType>UINT8</DatumType>
       <ValidUsage>FIXED_AT_BUILD</ValidUsage>
       <DefaultValue>0xAF</DefaultValue>
@@ -1340,7 +1346,7 @@
     <PcdEntry>
       <C_Name>PcdPerformanceLibraryPropertyMask</C_Name>
       <Token>0x00000009</Token>
-      <TokenSpaceGuidCName>FIX_ME_PcdPerformanceLibraryPropertyMask</TokenSpaceGuidCName>
+      <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>
       <DatumType>UINT8</DatumType>
       <ValidUsage>FIXED_AT_BUILD</ValidUsage>
       <DefaultValue>0</DefaultValue>
@@ -1349,7 +1355,7 @@
     <PcdEntry>
       <C_Name>PcdPostCodePropertyMask</C_Name>
       <Token>0x0000000b</Token>
-      <TokenSpaceGuidCName>FIX_ME_PcdPostCodePropertyMask</TokenSpaceGuidCName>
+      <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>
       <DatumType>UINT8</DatumType>
       <ValidUsage>FIXED_AT_BUILD</ValidUsage>
       <DefaultValue>0</DefaultValue>