Remove the following PPIs from the IntelFrameworkPkg because they were identical...

[mirror_edk2.git] / IntelFrameworkPkg / IntelFrameworkPkg.dec

diff --git a/IntelFrameworkPkg/IntelFrameworkPkg.dec b/IntelFrameworkPkg/IntelFrameworkPkg.dec
index 82254e44e5b86bd2bdc1df8ee35fb9994c7ea092..1a06fce5e35b4debbda23152d7464ce79a970481 100644 (file)
--- a/IntelFrameworkPkg/IntelFrameworkPkg.dec
+++ b/IntelFrameworkPkg/IntelFrameworkPkg.dec
@@ -19,14 +19,13 @@
   PACKAGE_GUID                   = 2759ded5-bb57-4b06-af4f-c398fa552719\r
   PACKAGE_VERSION                = 1.0\r
 \r
-\r
-[Includes.common]\r
+[Includes]\r
   Include                        # Root include for the package\r
 \r
-[LibraryClasses.common]\r
+[LibraryClasses]\r
   SmmLib|Include/Library/SmmLib.h\r
 \r
-[Guids.common]\r
+[Guids]\r
   ## EdkCompatibilityPkg/Foundation/Framework/Guid/AcpiTableStorage/AcpiTableStorage.h\r
   gEfiAcpiTableStorageGuid       = { 0x7e374e25, 0x8e01, 0x4fee, { 0x87, 0xf2, 0x39, 0x0c, 0x23, 0xc6, 0x06, 0xcd }}\r
   \r
@@ -63,7 +62,13 @@
   ## Include/Guid/FirmwareFileSystem.h\r
   gEfiFirmwareFileSystemGuid     = { 0x7A9354D9, 0x0468, 0x444a, {0x81, 0xCE, 0x0B, 0xF6, 0x17, 0xD8, 0x90, 0xDF }}\r
 \r
-[Protocols.common]\r
+  ##   Include/Guid/BlockIo.h\r
+  gEfiPeiIdeBlockIoPpiGuid       = { 0x0964e5b22, 0x6459, 0x11d2, { 0x8e, 0x39, 0x00, 0xa0, 0xc9, 0x69, 0x72, 0x3b }}\r
+  \r
+  ##  Include/Guid/BlockIo.h\r
+  gEfiPei144FloppyBlockIoPpiGuid = { 0xda6855bd, 0x07b7, 0x4c05, { 0x9e, 0xd8, 0xe2, 0x59, 0xfd, 0x36, 0x0e, 0x22 }}\r
+    \r
+[Protocols]\r
   ## Include/Protocol/AcpiS3Save.h\r
   gEfiAcpiS3SaveProtocolGuid     = { 0x125F2DE1, 0xFB85, 0x440C, { 0xA5, 0x4C, 0x4D, 0x99, 0x35, 0x8A, 0x8D, 0x38 }}\r
   \r
@@ -169,28 +174,10 @@
   ## Include/Protocol/FrameworkFormBrowser.h\r
   gEfiFormBrowserCompatibilityProtocolGuid    = { 0xfb7c852, 0xadca, 0x4853, { 0x8d, 0xf, 0xfb, 0xa7, 0x1b, 0x1c, 0xe1, 0x1a }}\r
 \r
-[Ppis.common]\r
+[Ppis]\r
   ## Include/Ppi/BootScriptExecuter.h\r
   gEfiPeiBootScriptExecuterPpiGuid = { 0xabd42895, 0x78cf, 0x4872, { 0x84, 0x44, 0x1b, 0x5c, 0x18, 0x0b, 0xfb, 0xff }}\r
   \r
-  ## Include/Ppi/RecoveryModule.h\r
-  gEfiPeiRecoveryModulePpiGuid   = { 0xFB6D9542, 0x612D, 0x4f45, { 0x87, 0x2f, 0x5c, 0xff, 0x52, 0xe9, 0x3d, 0xcf }}\r
-  \r
-  ## Include/Ppi/DeviceRecoveryModule.h\r
-  gEfiPeiDeviceRecoveryModulePpiGuid = {0x0DE2CE25, 0x446A, 0x45a7, {0xBF, 0xC9, 0x37, 0xDA, 0x26, 0x34, 0x4B, 0x37 }}\r
-  \r
-  ## Include/Ppi/BlockIo.h\r
-  gEfiPeiVirtualBlockIoPpiGuid   = { 0x695d8aa1, 0x42ee, 0x4c46, { 0x80, 0x5c, 0x6e, 0xa6, 0xbc, 0xe7, 0x99, 0xe3 }}\r
-  \r
-  ##  Include/Ppi/BlockIo.h\r
-  gEfiPei144FloppyBlockIoPpiGuid = { 0xda6855bd, 0x07b7, 0x4c05, { 0x9e, 0xd8, 0xe2, 0x59, 0xfd, 0x36, 0x0e, 0x22 }}\r
-  \r
-  ##   Include/Ppi/BlockIo.h\r
-  gEfiPeiIdeBlockIoPpiGuid       = { 0x0964e5b22, 0x6459, 0x11d2, { 0x8e, 0x39, 0x00, 0xa0, 0xc9, 0x69, 0x72, 0x3b }}\r
-  \r
-  ## Include/Ppi/S3Resume.h\r
-  gEfiPeiS3ResumePpiGuid         = { 0x4426CCB2, 0xE684, 0x4a8a, { 0xae, 0x40, 0x20, 0xd4, 0xb0, 0x25, 0xb7, 0x10 }}\r
-  \r
   ## Include/Ppi/Security.h\r
   gEfiPeiSecurityPpiGuid         = { 0x1388066E, 0x3A57, 0x4EFA, { 0x98, 0xF3, 0xC1, 0x2F, 0x3A, 0x95, 0x8A, 0x29 }}\r
   \r
@@ -211,4 +198,3 @@
   \r
   ## Include/Ppi/FindFv.h\r
   gEfiFindFvPpiGuid              = { 0x36164812, 0xa023, 0x44e5, { 0xbd, 0x85, 0x05, 0xbf, 0x3c, 0x77, 0x00, 0xaa }}\r
-\r