sync dec with nspd.

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@2774 6f19259b-4bc3-4df7-8a09-765794883524

diff --git a/MdePkg/MdePkg.dec b/MdePkg/MdePkg.dec
index 90b49ac30867dc68a75a7168eac5f5a8a8a18d59..e6c94d9023cc1a65fcc6dc538121f2b184339171 100644 (file)
--- a/MdePkg/MdePkg.dec
+++ b/MdePkg/MdePkg.dec
@@ -68,6 +68,7 @@
 #\r
 ################################################################################\r
 [LibraryClasses.common]\r
 #\r
 ################################################################################\r
 [LibraryClasses.common]\r

+  CustomDecompressLib|Include/Library/CustomDecompressLib.h\r

   UsbLib|Include/Library/UsbLib.h\r
   UefiRuntimeServicesTableLib|Include/Library/UefiRuntimeServicesTableLib.h\r
   UefiRuntimeLib|Include/Library/UefiRuntimeLib.h\r
   UsbLib|Include/Library/UsbLib.h\r
   UefiRuntimeServicesTableLib|Include/Library/UefiRuntimeServicesTableLib.h\r
   UefiRuntimeLib|Include/Library/UefiRuntimeLib.h\r


@@ -110,7 +111,6 @@
   CacheMaintenanceLib|Include/Library/CacheMaintenanceLib.h\r
   BaseMemoryLib|Include/Library/BaseMemoryLib.h\r
   BaseLib|Include/Library/BaseLib.h\r
   CacheMaintenanceLib|Include/Library/CacheMaintenanceLib.h\r
   BaseMemoryLib|Include/Library/BaseMemoryLib.h\r
   BaseLib|Include/Library/BaseLib.h\r

-  CustomDecompressLib|Include/Library/CustomDecompressLib.h\r

 \r
 ################################################################################\r
 #\r
 \r
 ################################################################################\r
 #\r


@@ -207,6 +207,7 @@
   gEfiUsbIoProtocolGuid          = { 0x2B2F68D6, 0x0CD2, 0x44CF, { 0x8E, 0x8B, 0xBB, 0xA2, 0x0B, 0x1B, 0x5B, 0x75 }}\r
   gEfiUsbHcProtocolGuid          = { 0xF5089266, 0x1AA0, 0x4953, { 0x97, 0xD8, 0x56, 0x2F, 0x8A, 0x73, 0xB5, 0x19 }}\r
   gEfiUnicodeCollationProtocolGuid = { 0x1D85CD7F, 0xF43D, 0x11D2, { 0x9A, 0x0C, 0x00, 0x90, 0x27, 0x3F, 0xC1, 0x4D }}\r
   gEfiUsbIoProtocolGuid          = { 0x2B2F68D6, 0x0CD2, 0x44CF, { 0x8E, 0x8B, 0xBB, 0xA2, 0x0B, 0x1B, 0x5B, 0x75 }}\r
   gEfiUsbHcProtocolGuid          = { 0xF5089266, 0x1AA0, 0x4953, { 0x97, 0xD8, 0x56, 0x2F, 0x8A, 0x73, 0xB5, 0x19 }}\r
   gEfiUnicodeCollationProtocolGuid = { 0x1D85CD7F, 0xF43D, 0x11D2, { 0x9A, 0x0C, 0x00, 0x90, 0x27, 0x3F, 0xC1, 0x4D }}\r

+  gEfiUgaIoProtocolGuid          = { 0x61A4D49E, 0x6F68, 0x4F1B, { 0xB9, 0x22, 0xA8, 0x6E, 0xED, 0x0B, 0x07, 0xA2 }}\r

   gEfiUgaDrawProtocolGuid        = { 0x982C298B, 0xF4FA, 0x41CB, { 0xB8, 0x38, 0x77, 0xAA, 0x68, 0x8F, 0xB8, 0x39 }}\r
   gEfiSimpleTextOutProtocolGuid  = { 0x387477C2, 0x69C7, 0x11D2, { 0x8E, 0x39, 0x00, 0xA0, 0xC9, 0x69, 0x72, 0x3B }}\r
   gEfiSimpleTextInProtocolGuid   = { 0x387477C1, 0x69C7, 0x11D2, { 0x8E, 0x39, 0x00, 0xA0, 0xC9, 0x69, 0x72, 0x3B }}\r
   gEfiUgaDrawProtocolGuid        = { 0x982C298B, 0xF4FA, 0x41CB, { 0xB8, 0x38, 0x77, 0xAA, 0x68, 0x8F, 0xB8, 0x39 }}\r
   gEfiSimpleTextOutProtocolGuid  = { 0x387477C2, 0x69C7, 0x11D2, { 0x8E, 0x39, 0x00, 0xA0, 0xC9, 0x69, 0x72, 0x3B }}\r
   gEfiSimpleTextInProtocolGuid   = { 0x387477C1, 0x69C7, 0x11D2, { 0x8E, 0x39, 0x00, 0xA0, 0xC9, 0x69, 0x72, 0x3B }}\r


@@ -265,8 +266,18 @@
 #\r
 ################################################################################\r
 [Ppis.common]\r
 #\r
 ################################################################################\r
 [Ppis.common]\r

-       gEfiPeiMasterBootModePpiGuid     = {0x7408d748, 0xfc8c, 0x4ee6, {0x92, 0x88, 0xc4, 0xbe, 0xc0, 0x92, 0xa4, 0x10 }}\r
-       gEfiPeiBootInRecoveryModePpiGuid = {0x17ee496a, 0xd8e4, 0x4b9a, {0x94, 0xd1, 0xce, 0x82, 0x72, 0x30, 0x8, 0x50 }}\r
+  gEfiPeiStallPpiGuid            = { 0x1F4C6F90, 0xB06B, 0x48D8, { 0xA2, 0x01, 0xBA, 0xE5, 0xF1, 0xCD, 0x7D, 0x56 }}\r
+  gPcdPpiGuid                    = { 0x06E81C58, 0x4AD7, 0x44BC, { 0x83, 0x90, 0xF1, 0x02, 0x65, 0xF7, 0x24, 0x80 }}\r
+  gEfiPeiStatusCodePpiGuid       = { 0x229832D3, 0x7A30, 0x4B36, { 0xB8, 0x27, 0xF4, 0x0C, 0xB7, 0xD4, 0x54, 0x36 }}\r
+  gEfiSecPlatformInformationPpiGuid = { 0x6F8C2B35, 0xFEF4, 0x448D, { 0x82, 0x56, 0xE1, 0x1B, 0x19, 0xD6, 0x10, 0x77 }}\r
+  gEfiPeiResetPpiGuid            = { 0xEF398D58, 0x9DFD, 0x4103, { 0xBF, 0x94, 0x78, 0xC6, 0xF4, 0xFE, 0x71, 0x2F }}\r
+  gEfiPeiMemoryDiscoveredPpiGuid = { 0xF894643D, 0xC449, 0x42D1, { 0x8E, 0xA8, 0x85, 0xBD, 0xD8, 0xC6, 0x5B, 0xDE }}\r
+  gEfiPeiMasterBootModePpiGuid   = { 0x7408D748, 0xFC8C, 0x4EE6, { 0x92, 0x88, 0xC4, 0xBE, 0xC0, 0x92, 0xA4, 0x10 }}\r
+  gEfiPeiFvFileLoaderPpiGuid     = { 0x7E1F0D85, 0x04FF, 0x4BB2, { 0x86, 0x6A, 0x31, 0xA2, 0x99, 0x6A, 0x48, 0xA8 }}\r
+  gEfiEndOfPeiSignalPpiGuid      = { 0x605EA650, 0xC65C, 0x42E1, { 0xBA, 0x80, 0x91, 0xA5, 0x2A, 0xB6, 0x18, 0xC6 }}\r
+  gEfiDxeIplPpiGuid              = { 0x0AE8CE5D, 0xE448, 0x4437, { 0xA8, 0xD7, 0xEB, 0xF5, 0xF1, 0x94, 0xF7, 0x31 }}\r
+  gEfiPeiCpuIoPpiInServiceTableGuid = { 0xE6AF1F7B, 0xFC3F, 0x46DA, { 0xA8, 0x28, 0xA3, 0xB4, 0x57, 0xA4, 0x42, 0x82 }}\r
+  gEfiPeiBootInRecoveryModePpiGuid = { 0x17EE496A, 0xD8E4, 0x4B9A, { 0x94, 0xD1, 0xCE, 0x82, 0x72, 0x30, 0x08, 0x50 }}\r

 \r
 ################################################################################\r
 #\r
 \r
 ################################################################################\r
 #\r


@@ -279,8 +290,8 @@
 [PcdsFeatureFlag.common]\r
   PcdComponentNameDisable|0x0000000d|gEfiMdePkgTokenSpaceGuid|BOOLEAN|FALSE\r
   PcdDriverDiagnosticsDisable|0x0000000e|gEfiMdePkgTokenSpaceGuid|BOOLEAN|FALSE\r
 [PcdsFeatureFlag.common]\r
   PcdComponentNameDisable|0x0000000d|gEfiMdePkgTokenSpaceGuid|BOOLEAN|FALSE\r
   PcdDriverDiagnosticsDisable|0x0000000e|gEfiMdePkgTokenSpaceGuid|BOOLEAN|FALSE\r

-  PcdComponentName2Disable|0x0000ffff|gEfiMdePkgTokenSpaceGuid|BOOLEAN|FALSE\r
-  PcdDriverDiagnostics2Disable|0x0000fffe|gEfiMdePkgTokenSpaceGuid|BOOLEAN|FALSE\r
+  PcdComponentName2Disable|0x0000000f|gEfiMdePkgTokenSpaceGuid|BOOLEAN|FALSE\r
+  PcdDriverDiagnostics2Disable|0x00000010|gEfiMdePkgTokenSpaceGuid|BOOLEAN|FALSE\r

 \r
 [PcdsFixedAtBuild.common]\r
   PcdMaximumUnicodeStringLength|0x00000001|gEfiMdePkgTokenSpaceGuid|UINT32|1000000\r
 \r
 [PcdsFixedAtBuild.common]\r
   PcdMaximumUnicodeStringLength|0x00000001|gEfiMdePkgTokenSpaceGuid|UINT32|1000000\r

diff --git a/MdePkg/MdePkg.nspd b/MdePkg/MdePkg.nspd
index 150b9f06db86619f9b6a6b8f55012f40a96bc04d..f296553920993b25c49230b0a9a31c5bf78a00c7 100644 (file)
--- a/MdePkg/MdePkg.nspd
+++ b/MdePkg/MdePkg.nspd
@@ -82,10 +82,6 @@
       <IncludeHeader>Include/Library/MemoryAllocationLib.h</IncludeHeader>\r
       <HelpText/>\r
     </LibraryClass>\r
       <IncludeHeader>Include/Library/MemoryAllocationLib.h</IncludeHeader>\r
       <HelpText/>\r
     </LibraryClass>\r

-    <LibraryClass Name="PalCallLib" SupArchList="IPF">\r
-      <IncludeHeader>Include/Library/PalCallLib.h</IncludeHeader>\r
-      <HelpText>Implement the PAL call</HelpText>\r
-    </LibraryClass>\r

     <LibraryClass Name="PcdLib">\r
       <IncludeHeader>Include/Library/PcdLib.h</IncludeHeader>\r
       <HelpText/>\r
     <LibraryClass Name="PcdLib">\r
       <IncludeHeader>Include/Library/PcdLib.h</IncludeHeader>\r
       <HelpText/>\r