Remove FlashMap Ppi that has been replaced by Flash related PCDs.

Remove OperatorPresence Ppi that is only related to TCG driver, which should be not in this package.

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

diff --git a/MdeModulePkg/Include/Ppi/FlashMap.h b/MdeModulePkg/Include/Ppi/FlashMap.h
deleted file mode 100644 (file)
index 1bd0e72..0000000
--- a/MdeModulePkg/Include/Ppi/FlashMap.h
+++ /dev/null
@@ -1,56 +0,0 @@
-/** @file\r
-\r
-  FlashMap PPI abstracts access to FlashMap information. \r
-\r
-Copyright (c) 2006 - 2008, Intel Corporation                                                         \r
-All rights reserved. This program and the accompanying materials                          \r
-are licensed and made available under the terms and conditions of the BSD License         \r
-which accompanies this distribution.  The full text of the license may be found at        \r
-http://opensource.org/licenses/bsd-license.php                                            \r
-                                                                                          \r
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,                     \r
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.             \r
-\r
-**/\r
-\r
-#ifndef _PEI_FLASH_MAP_PPI_H_\r
-#define _PEI_FLASH_MAP_PPI_H_\r
-\r
-#include <Guid/FlashMapHob.h>\r
-\r
-#define PEI_FLASH_MAP_PPI_GUID \\r
-  { 0xf34c2fa0, 0xde88, 0x4270, {0x84, 0x14, 0x96, 0x12, 0x22, 0xf4, 0x52, 0x1c } }\r
-\r
-typedef struct _PEI_FLASH_MAP_PPI PEI_FLASH_MAP_PPI;\r
-\r
-/**\r
-  Get flash region information.\r
-  \r
-  @param  PeiServices      An indirect pointer to the PEI Services Table published by the PEI Foundation.\r
-  @param  This             Pointer to the FlashMap PPI instance\r
-  @param  AreaType         Flash Area Type\r
-  @param  AreaTypeGuid     Pointer to Guid for Flash Area Type \r
-  @param  NumEntries       Pointer to the number of entries for the total flash area.\r
-  @param  Entries          Pointer to the entry list. \r
-   \r
-  @retval EFI_SUCESS       Get flash area information successfully.\r
-  @retval EFI_NOT_FOUND    No flash area information is found.\r
-**/\r
-typedef\r
-EFI_STATUS\r
-(EFIAPI *PEI_GET_FLASH_AREA_INFO)(\r
-  IN  EFI_PEI_SERVICES            **PeiServices,\r
-  IN  PEI_FLASH_MAP_PPI           *This,\r
-  IN  EFI_FLASH_AREA_TYPE         AreaType,\r
-  IN  EFI_GUID                    *AreaTypeGuid,\r
-  OUT UINT32                      *NumEntries,\r
-  OUT EFI_FLASH_SUBAREA_ENTRY     **Entries\r
-  );\r
-\r
-struct _PEI_FLASH_MAP_PPI {\r
-  PEI_GET_FLASH_AREA_INFO GetAreaInfo;\r
-};\r
-\r
-extern EFI_GUID gPeiFlashMapPpiGuid;\r
-\r
-#endif \r

diff --git a/MdeModulePkg/Include/Ppi/OperatorPresence.h b/MdeModulePkg/Include/Ppi/OperatorPresence.h
deleted file mode 100644 (file)
index ba89016..0000000
--- a/MdeModulePkg/Include/Ppi/OperatorPresence.h
+++ /dev/null
@@ -1,29 +0,0 @@
-/** @file\r
-  This file defines OperatorPresent PPI. It is responsible for detecting TPM operator presence.\r
-\r
-Copyright (c) 2006 - 2008, Intel Corporation. <BR>\r
-All rights reserved. This program and the accompanying materials\r
-are licensed and made available under the terms and conditions of the BSD License\r
-which accompanies this distribution.  The full text of the license may be found at\r
-http://opensource.org/licenses/bsd-license.php\r
-\r
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
-\r
-**/\r
-\r
-#ifndef _PEI_OPERATOR_PRESENCE_H_\r
-#define _PEI_OPERATOR_PRESENCE_H_\r
-\r
-#define PEI_OPERATOR_PRESENCE_PPI_GUID  \\r
-  { 0x20a7378c, 0xaa83, 0x4ce1, {0x82, 0x1f, 0x47, 0x40, 0xee, 0x1b, 0x3f, 0x9f } }\r
-\r
-typedef struct _PEI_OPERATOR_PRESENCE_PPI PEI_OPERATOR_PRESENCE_PPI;\r
-\r
-struct _PEI_OPERATOR_PRESENCE_PPI {\r
-  BOOLEAN                           OperatorPresent; ///> TRUE if TPM Operator is detected.\r
-};\r
-\r
-extern EFI_GUID                     gPeiOperatorPresencePpiGuid;\r
-\r
-#endif  //  _PEI_OPERATOR_PRESENCE_H_\r

diff --git a/MdeModulePkg/MdeModulePkg.dec b/MdeModulePkg/MdeModulePkg.dec
index 6675ffb7fba6f346b2f8868c84102d09ca7cbc01..97133869d24c60eee7eac7f04c2b11de55e2c864 100644 (file)
--- a/MdeModulePkg/MdeModulePkg.dec
+++ b/MdeModulePkg/MdeModulePkg.dec
@@ -224,13 +224,6 @@
   ## Pei memory test PPI used to Perform memory test in PEI phase.\r
   gPeiBaseMemoryTestPpiGuid      = { 0xB6EC423C, 0x21D2, 0x490D, { 0x85, 0xC6, 0xDD, 0x58, 0x64, 0xEA, 0xA6, 0x74 }}\r
 \r
-  ## FlashMap PPI abstracts access to FlashMap information.\r
-  #  gPeiFlashMapPpiGuid will be removed in future.\r
-  gPeiFlashMapPpiGuid            = { 0xf34c2fa0, 0xde88, 0x4270, {0x84, 0x14, 0x96, 0x12, 0x22, 0xf4, 0x52, 0x1c } }\r
-  \r
-  ## OperatorPresent PPI responsible for detecting TPM operator presence.\r
-  gPeiOperatorPresencePpiGuid    = { 0x20a7378c, 0xaa83, 0x4ce1, {0x82, 0x1f, 0x47, 0x40, 0xee, 0x1b, 0x3f, 0x9f } }\r
-\r
 [PcdsFeatureFlag.common]\r
   ## Indicate whether platform can support update capsule across a system reset\r
   gEfiMdeModulePkgTokenSpaceGuid.PcdSupportUpdateCapsuleReset|FALSE|BOOLEAN|0x0001001d\r