2 files changed, 7 insertions, 18 deletions

diff --git a/MdePkg/Include/Pi/PiDxeCis.h b/MdePkg/Include/Pi/PiDxeCis.h
index bb7fb2c38a..04410c5a1a 100644
--- a/MdePkg/Include/Pi/PiDxeCis.h
+++ b/MdePkg/Include/Pi/PiDxeCis.h
@@ -56,14 +56,11 @@ typedef enum {
   /// system. If all memory has the same reliability, then this bit is not used.

   ///

   EfiGcdMemoryTypeMoreReliable,

-  // ///

-  // /// A memory region that describes system memory that has not been accepted

-  // /// by a corresponding call to the underlying isolation architecture.

-  // ///

-  // /// Please be noted:

-  // /// EfiGcdMemoryTypeUnaccepted is defined in PrePiDxeCis.h because it has not been

-  // /// defined in PI spec.

-  // EfiGcdMemoryTypeUnaccepted,

+  ///

+  /// A memory region that describes system memory that has not been accepted

+  /// by a corresponding call to the underlying isolation architecture.

+  ///

+  EfiGcdMemoryTypeUnaccepted,

   EfiGcdMemoryTypeMaximum = 7

 } EFI_GCD_MEMORY_TYPE;

 

diff --git a/MdePkg/Include/Pi/PiHob.h b/MdePkg/Include/Pi/PiHob.h
index f730520e8c..9e49421afa 100644
--- a/MdePkg/Include/Pi/PiHob.h
+++ b/MdePkg/Include/Pi/PiHob.h
@@ -232,16 +232,8 @@ typedef UINT32 EFI_RESOURCE_TYPE;
 #define EFI_RESOURCE_MEMORY_MAPPED_IO_PORT  0x00000004

 #define EFI_RESOURCE_MEMORY_RESERVED        0x00000005

 #define EFI_RESOURCE_IO_RESERVED            0x00000006

-//

-// BZ3937_EFI_RESOURCE_MEMORY_UNACCEPTED is defined for unaccepted memory.

-// But this defitinion has not been officially in the PI spec. Base

-// on the code-first we define BZ3937_EFI_RESOURCE_MEMORY_UNACCEPTED at

-// MdeModulePkg/Include/Pi/PrePiHob.h and update EFI_RESOURCE_MAX_MEMORY_TYPE

-// to 8. After BZ3937_EFI_RESOURCE_MEMORY_UNACCEPTED is officially published

-// in PI spec, we will re-visit here.

-//

-// #define BZ3937_EFI_RESOURCE_MEMORY_UNACCEPTED      0x00000007

-#define EFI_RESOURCE_MAX_MEMORY_TYPE  0x00000008

+#define EFI_RESOURCE_MEMORY_UNACCEPTED      0x00000007

+#define EFI_RESOURCE_MAX_MEMORY_TYPE        0x00000008

 

 ///

 /// A type of recount attribute type.