Move out the FlashMapHob

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

diff --git a/MdeModulePkg/Include/Guid/FlashMapHob.h b/MdeModulePkg/Include/Guid/FlashMapHob.h
deleted file mode 100644 (file)
index 416a8c6..0000000
--- a/MdeModulePkg/Include/Guid/FlashMapHob.h
+++ /dev/null
@@ -1,119 +0,0 @@
-/*++\r
-\r
-Copyright (c) 2006, 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
-Module Name:\r
-\r
-  FlashMapHob.h\r
-    \r
-Abstract:\r
-\r
-  GUID used for Flash Map HOB entries in the HOB list.\r
-\r
---*/\r
-\r
-#ifndef _FLASH_MAP_HOB_GUID_H_\r
-#define _FLASH_MAP_HOB_GUID_H_\r
-\r
-//\r
-// Definitions for Flash Map\r
-//\r
-#define EFI_FLASH_MAP_HOB_GUID \\r
-  { 0xb091e7d2, 0x5a0, 0x4198, {0x94, 0xf0, 0x74, 0xb7, 0xb8, 0xc5, 0x54, 0x59 } }\r
-\r
-\r
-//\r
-// Definition for flash map GUIDed HOBs\r
-//\r
-typedef UINT32  EFI_FLASH_AREA_ATTRIBUTES;\r
-\r
-#define EFI_FLASH_AREA_FV           0x0001\r
-#define EFI_FLASH_AREA_SUBFV        0x0002\r
-#define EFI_FLASH_AREA_MEMMAPPED_FV 0x0004\r
-#define EFI_FLASH_AREA_REQUIRED     0x0008\r
-#define EFI_FLASH_AREA_CORRUPT      0x0010\r
-\r
-typedef UINT8   EFI_FLASH_AREA_TYPE;\r
-\r
-#define EFI_FLASH_AREA_RECOVERY_BIOS  0x0   // Recovery code\r
-#define EFI_FLASH_AREA_MAIN_BIOS      0x1   // Regular BIOS code\r
-#define EFI_FLASH_AREA_PAL_B          0x2   // PAL-B\r
-#define EFI_FLASH_AREA_RESERVED_03    0x3   // Reserved for backwards compatibility\r
-#define EFI_FLASH_AREA_RESERVED_04    0x4   // Reserved for backwards compatibility\r
-#define EFI_FLASH_AREA_DMI_FRU        0x5   // DMI FRU information\r
-#define EFI_FLASH_AREA_OEM_BINARY     0x6   // OEM Binary Code/data\r
-#define EFI_FLASH_AREA_RESERVED_07    0x7   // Reserved for backwards compatibility\r
-#define EFI_FLASH_AREA_RESERVED_08    0x8   // Reserved for backwards compatibility\r
-#define EFI_FLASH_AREA_RESERVED_09    0x9   // Reserved for backwards compatibility\r
-#define EFI_FLASH_AREA_RESERVED_0A    0x0a  // Reserved for backwards compatibility\r
-#define EFI_FLASH_AREA_EFI_VARIABLES  0x0b  // EFI variables\r
-#define EFI_FLASH_AREA_MCA_LOG        0x0c  // MCA error log\r
-#define EFI_FLASH_AREA_SMBIOS_LOG     0x0d  // SMBIOS error log\r
-#define EFI_FLASH_AREA_FTW_BACKUP     0x0e  // A backup block during FTW operations\r
-#define EFI_FLASH_AREA_FTW_STATE      0x0f  // State information during FTW operations\r
-#define EFI_FLASH_AREA_UNUSED         0x0fd // Not used\r
-#define EFI_FLASH_AREA_GUID_DEFINED   0x0fe // Usage defined by a GUID\r
-#pragma pack(1)\r
-//\r
-// An individual sub-area Entry.\r
-// A single flash area may consist of  more than one sub-area.\r
-//\r
-typedef struct {\r
-  EFI_FLASH_AREA_ATTRIBUTES Attributes;\r
-  UINT32                    Reserved;\r
-  EFI_PHYSICAL_ADDRESS      Base;\r
-  EFI_PHYSICAL_ADDRESS      Length;\r
-  EFI_GUID                  FileSystem;\r
-} EFI_FLASH_SUBAREA_ENTRY;\r
-\r
-typedef struct {\r
-  UINT8                   Reserved[3];\r
-  EFI_FLASH_AREA_TYPE     AreaType;\r
-  EFI_GUID                AreaTypeGuid;\r
-  UINT32                  NumEntries;\r
-  EFI_FLASH_SUBAREA_ENTRY Entries[1];\r
-} EFI_FLASH_MAP_ENTRY_DATA;\r
-\r
-typedef struct {\r
-  EFI_HOB_GENERIC_HEADER  Header;\r
-  EFI_GUID                Name;\r
-  UINT8                   Reserved[3];\r
-  EFI_FLASH_AREA_TYPE     AreaType;\r
-  EFI_GUID                AreaTypeGuid;\r
-  UINT32                  NumEntries;\r
-  EFI_FLASH_SUBAREA_ENTRY Entries[1];\r
-} EFI_HOB_FLASH_MAP_ENTRY_TYPE;\r
-\r
-//\r
-// Internal definitions\r
-//\r
-typedef struct {\r
-  UINT8                   Reserved[3];\r
-  EFI_FLASH_AREA_TYPE     AreaType;\r
-  EFI_GUID                AreaTypeGuid;\r
-  UINT32                  NumberOfEntries;\r
-  EFI_FLASH_SUBAREA_ENTRY SubAreaData;\r
-} EFI_FLASH_AREA_HOB_DATA;\r
-\r
-typedef struct {\r
-  UINTN                     Base;\r
-  UINTN                     Length;\r
-  EFI_FLASH_AREA_ATTRIBUTES Attributes;\r
-  EFI_FLASH_AREA_TYPE       AreaType;\r
-  UINT8                     Reserved[3];\r
-  EFI_GUID                  AreaTypeGuid;\r
-} EFI_FLASH_AREA_DATA;\r
-\r
-#pragma pack()\r
-\r
-\r
-extern EFI_GUID gEfiFlashMapHobGuid;\r
-\r
-#endif // _FLASH_MAP_HOB_GUID_H_\r

diff --git a/MdeModulePkg/MdeModulePkg.dec b/MdeModulePkg/MdeModulePkg.dec
index 6650bc0a5e0dd4a2e1a6deb5147231323dd77c82..a3b8ae6a46c82fb4245db79ad6d2c4683f90e3e8 100644 (file)
--- a/MdeModulePkg/MdeModulePkg.dec
+++ b/MdeModulePkg/MdeModulePkg.dec
@@ -60,7 +60,6 @@
   gPeiPerformanceHobGuid         = { 0xEC4DF5AF, 0x4395, 0x4CC9, { 0x94, 0xDE, 0x77, 0x50, 0x6D, 0x12, 0xC7, 0xB8 }}\r
   gEfiGenericPlatformVariableGuid = { 0x59d1c24f, 0x50f1, 0x401a, { 0xb1, 0x01, 0xf3, 0x3e, 0x0d, 0xae, 0xd4, 0x43 }}\r
   gEfiShellFileGuid              = { 0xC57AD6B7, 0x0515, 0x40A8, { 0x9D, 0x21, 0x55, 0x16, 0x52, 0x85, 0x4E, 0x37 }}\r
   gPeiPerformanceHobGuid         = { 0xEC4DF5AF, 0x4395, 0x4CC9, { 0x94, 0xDE, 0x77, 0x50, 0x6D, 0x12, 0xC7, 0xB8 }}\r
   gEfiGenericPlatformVariableGuid = { 0x59d1c24f, 0x50f1, 0x401a, { 0xb1, 0x01, 0xf3, 0x3e, 0x0d, 0xae, 0xd4, 0x43 }}\r
   gEfiShellFileGuid              = { 0xC57AD6B7, 0x0515, 0x40A8, { 0x9D, 0x21, 0x55, 0x16, 0x52, 0x85, 0x4E, 0x37 }}\r

-  gEfiFlashMapHobGuid            = { 0xB091E7D2, 0x05A0, 0x4198, { 0x94, 0xF0, 0x74, 0xB7, 0xB8, 0xC5, 0x54, 0x59 }}\r

   gEfiStandardErrorDeviceGuid    = { 0xD3B36F2D, 0xD551, 0x11D4, { 0x9A, 0x46, 0x00, 0x90, 0x27, 0x3F, 0xC1, 0x4D }}\r
   gEfiPeiPeCoffLoaderGuid        = { 0xD8117CFF, 0x94A6, 0x11D4, { 0x9A, 0x3A, 0x00, 0x90, 0x27, 0x3F, 0xC1, 0x4D }}\r
   gEfiVariableInfoGuid           = { 0xddcf3616, 0x3275, 0x4164, { 0x98, 0xb6, 0xfe, 0x85, 0x70, 0x7f, 0xfe, 0x7d }}\r
   gEfiStandardErrorDeviceGuid    = { 0xD3B36F2D, 0xD551, 0x11D4, { 0x9A, 0x46, 0x00, 0x90, 0x27, 0x3F, 0xC1, 0x4D }}\r
   gEfiPeiPeCoffLoaderGuid        = { 0xD8117CFF, 0x94A6, 0x11D4, { 0x9A, 0x3A, 0x00, 0x90, 0x27, 0x3F, 0xC1, 0x4D }}\r
   gEfiVariableInfoGuid           = { 0xddcf3616, 0x3275, 0x4164, { 0x98, 0xb6, 0xfe, 0x85, 0x70, 0x7f, 0xfe, 0x7d }}\r