Sync with the PO-2 release branch (version: EDK 4645 and R9 3897)

git-svn-id: https://edk2.tianocore.org/svn/edk2/trunk@4647 de2fecce-e211-0410-80a6-f3fac2684e05

diff --git a/edk2/IntelFrameworkModulePkg/Universal/StatusCode/Pei/PeiStatusCode.inf b/edk2/IntelFrameworkModulePkg/Universal/StatusCode/Pei/PeiStatusCode.inf
index 2a2bee3..c504f1a 100644 (file)
--- a/edk2/IntelFrameworkModulePkg/Universal/StatusCode/Pei/PeiStatusCode.inf
+++ b/edk2/IntelFrameworkModulePkg/Universal/StatusCode/Pei/PeiStatusCode.inf
@@ -74,3 +74,5 @@
 [Pcd.common]\r
   gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdStatusCodeMemorySize\r
 \r
+[Depex]\r
+  TRUE\r

diff --git a/edk2/MdePkg/Include/IndustryStandard/Acpi2_0.h b/edk2/MdePkg/Include/IndustryStandard/Acpi2_0.h
index 946ed59..77c0284 100644 (file)
--- a/edk2/MdePkg/Include/IndustryStandard/Acpi2_0.h
+++ b/edk2/MdePkg/Include/IndustryStandard/Acpi2_0.h
@@ -498,6 +498,11 @@ typedef struct {
 //\r
 #define EFI_ACPI_2_0_EXTENDED_SYSTEM_DESCRIPTION_TABLE_SIGNATURE  0x54445358\r
 \r
+//\r
+// "MCFG" Static Resource Affinity Table\r
+//\r
+#define EFI_ACPI_2_0_MEMORY_MAPPED_CONFIGURATION_BASE_ADDRESS_TABLE_SIGNATURE 0x4746434D\r
+\r
 #pragma pack()\r
 \r
 #endif\r

diff --git a/edk2/MdePkg/Include/IndustryStandard/MemoryMappedConfigurationSpaceAccessTable.h b/edk2/MdePkg/Include/IndustryStandard/MemoryMappedConfigurationSpaceAccessTable.h
index c7d1db5..d826b62 100644 (file)
--- a/edk2/MdePkg/Include/IndustryStandard/MemoryMappedConfigurationSpaceAccessTable.h
+++ b/edk2/MdePkg/Include/IndustryStandard/MemoryMappedConfigurationSpaceAccessTable.h
@@ -32,7 +32,14 @@ typedef struct {
   UINT8   EndBusNumber;\r
   UINT32  Reserved;\r
 } EFI_ACPI_MEMORY_MAPPED_ENHANCED_CONFIGURATION_SPACE_BASE_ADDRESS_ALLOCATION_STRUCTURE;\r
-\r
+//\r
+// MCFG Table header definition.  The rest of the table \r
+// must be defined in a platform specific manner.\r
+//\r
+typedef struct {\r
+  EFI_ACPI_DESCRIPTION_HEADER                       Header;\r
+  UINT64                                            Reserved;\r
+} EFI_ACPI_MEMORY_MAPPED_CONFIGURATION_BASE_ADDRESS_TABLE_HEADER;\r
 //\r
 // MCFG Revision (defined in spec)\r
 //\r