OvmfPkg: generate full MADT dynamically, synchronize contents with qemu

[mirror_edk2.git] / OvmfPkg / AcpiTables / Madt.aslc

diff --git a/OvmfPkg/AcpiTables/Madt.aslc b/OvmfPkg/AcpiTables/Madt.aslc
index f5b71a6e0ca943a590e057d09c87aef96553fbfb..62bf2c7fd223c5f5daf0039e86161dac778113bb 100644 (file)
--- a/OvmfPkg/AcpiTables/Madt.aslc
+++ b/OvmfPkg/AcpiTables/Madt.aslc
@@ -16,11 +16,7 @@
 **/\r
 \r
 #include <IndustryStandard/Acpi.h>\r
-\r
-//\r
-// MADT Definitions\r
-//\r
-#define EFI_ACPI_OEM_MADT_REVISION 0x00000000 // TBD\r
+#include <Platform.h>\r
 \r
 //\r
 // Local APIC address\r
@@ -74,21 +70,12 @@ EFI_ACPI_1_0_MULTIPLE_APIC_DESCRIPTION_TABLE Madt = {
   EFI_ACPI_1_0_APIC_SIGNATURE,\r
   sizeof (EFI_ACPI_1_0_MULTIPLE_APIC_DESCRIPTION_TABLE),\r
   EFI_ACPI_1_0_MULTIPLE_APIC_DESCRIPTION_TABLE_REVISION,\r
-\r
-  //\r
-  // Checksum will be updated at runtime\r
-  //\r
-  0x00,\r
-\r
-  //\r
-  // It is expected that these values will be programmed at runtime\r
-  //\r
-  ' ', ' ', ' ', ' ', ' ', ' ',\r
-\r
-  0,\r
-  EFI_ACPI_OEM_MADT_REVISION,\r
-  0,\r
-  0,\r
+  0x00,                                                     // Checksum will be updated at runtime\r
+  EFI_ACPI_OEM_ID,\r
+  EFI_ACPI_OEM_TABLE_ID,\r
+  EFI_ACPI_OEM_REVISION,\r
+  EFI_ACPI_CREATOR_ID,\r
+  EFI_ACPI_CREATOR_REVISION,\r
 \r
   //\r
   // MADT specific fields\r