From 3431f363371a54b9e1e219de41d0c10a93139524 Mon Sep 17 00:00:00 2001
From: zliu3 <zliu3@6f19259b-4bc3-4df7-8a09-765794883524>
Date: Thu, 31 Jan 2008 09:30:11 +0000
Subject: [PATCH] Sync with the PO-2 release branch (version: EDK 4645 and R9
 3897)

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@4647 6f19259b-4bc3-4df7-8a09-765794883524
---
 .../Universal/StatusCode/Pei/PeiStatusCode.inf           | 2 ++
 MdePkg/Include/IndustryStandard/Acpi2_0.h                | 5 +++++
 .../MemoryMappedConfigurationSpaceAccessTable.h          | 9 ++++++++-
 3 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/IntelFrameworkModulePkg/Universal/StatusCode/Pei/PeiStatusCode.inf b/IntelFrameworkModulePkg/Universal/StatusCode/Pei/PeiStatusCode.inf
index 2a2bee3adf..c504f1a0f3 100644
--- a/IntelFrameworkModulePkg/Universal/StatusCode/Pei/PeiStatusCode.inf
+++ b/IntelFrameworkModulePkg/Universal/StatusCode/Pei/PeiStatusCode.inf
@@ -74,3 +74,5 @@
 [Pcd.common]
   gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdStatusCodeMemorySize
 
+[Depex]
+  TRUE
diff --git a/MdePkg/Include/IndustryStandard/Acpi2_0.h b/MdePkg/Include/IndustryStandard/Acpi2_0.h
index 946ed596d3..77c0284e09 100644
--- a/MdePkg/Include/IndustryStandard/Acpi2_0.h
+++ b/MdePkg/Include/IndustryStandard/Acpi2_0.h
@@ -498,6 +498,11 @@ typedef struct {
 //
 #define EFI_ACPI_2_0_EXTENDED_SYSTEM_DESCRIPTION_TABLE_SIGNATURE  0x54445358
 
+//
+// "MCFG" Static Resource Affinity Table
+//
+#define EFI_ACPI_2_0_MEMORY_MAPPED_CONFIGURATION_BASE_ADDRESS_TABLE_SIGNATURE 0x4746434D
+
 #pragma pack()
 
 #endif
diff --git a/MdePkg/Include/IndustryStandard/MemoryMappedConfigurationSpaceAccessTable.h b/MdePkg/Include/IndustryStandard/MemoryMappedConfigurationSpaceAccessTable.h
index c7d1db5035..d826b62b83 100644
--- a/MdePkg/Include/IndustryStandard/MemoryMappedConfigurationSpaceAccessTable.h
+++ b/MdePkg/Include/IndustryStandard/MemoryMappedConfigurationSpaceAccessTable.h
@@ -32,7 +32,14 @@ typedef struct {
   UINT8   EndBusNumber;
   UINT32  Reserved;
 } EFI_ACPI_MEMORY_MAPPED_ENHANCED_CONFIGURATION_SPACE_BASE_ADDRESS_ALLOCATION_STRUCTURE;
-
+//
+// MCFG Table header definition.  The rest of the table 
+// must be defined in a platform specific manner.
+//
+typedef struct {
+  EFI_ACPI_DESCRIPTION_HEADER                       Header;
+  UINT64                                            Reserved;
+} EFI_ACPI_MEMORY_MAPPED_CONFIGURATION_BASE_ADDRESS_TABLE_HEADER;
 //
 // MCFG Revision (defined in spec)
 //