Merged in the following trackers from EDK:

[mirror_edk2.git] / MdePkg / Include / IndustryStandard / Acpi2_0.h

diff --git a/MdePkg/Include/IndustryStandard/Acpi2_0.h b/MdePkg/Include/IndustryStandard/Acpi2_0.h
index 9d46813f8ef444c8e88c5e4d0e65796673f254be..77c0284e09cacdc8d4f93899fc108e895c77b35a 100644 (file)
--- a/MdePkg/Include/IndustryStandard/Acpi2_0.h
+++ b/MdePkg/Include/IndustryStandard/Acpi2_0.h
@@ -15,7 +15,7 @@
 #ifndef _ACPI_2_0_H_\r
 #define _ACPI_2_0_H_\r
 \r
-#include "Acpi.h"\r
+#include <IndustryStandard/Acpi1_0.h>\r
 \r
 //\r
 // Ensure proper structure formats\r
@@ -26,28 +26,6 @@
 //\r
 #define EFI_ACPI_2_0_REVISION 0x02\r
 \r
-//\r
-// BUGBUG: OEM values need to be moved somewhere else, probably read from data hub\r
-// and produced by a platform specific driver.\r
-//\r
-//\r
-// ACPI OEM ID\r
-//\r
-#define EFI_ACPI_2_0_OEM_ID       "INTEL "\r
-#define EFI_ACPI_2_0_OEM_TABLE_ID 0x5034303738543245  // "E2T8704P"\r
-//\r
-// ACPI OEM Revision\r
-//\r
-#define EFI_ACPI_2_0_OEM_REVISION 0x00000002\r
-\r
-//\r
-// ACPI table creator ID\r
-//\r
-#define EFI_ACPI_2_0_CREATOR_ID 0x5446534D  // TBD "MSFT"\r
-//\r
-// ACPI table creator revision\r
-//\r
-#define EFI_ACPI_2_0_CREATOR_REVISION 0x01000013  // TBD\r
 //\r
 // ACPI 2.0 Generic Address Space definition\r
 //\r
@@ -520,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