ArmPlatformPkg/ArmJunoPkg/Madt.aslc: Fix MADT header version

Currently the MADT signature and revision is mapped to v1.0 macros
which results in MADT with incorrect entries in the header for Juno.
This patch fixes these EFI_ACPI_*_0_MULTIPLE_APIC_DESCRIPTION_TABLE
macros by using appropriate v5.0 versions.

Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Sudeep Holla <sudeep.holla@arm.com>
Reviewed-by: Leif Lindholm <leif.lindholm@linaro.org>
git-svn-id: https://svn.code.sf.net/p/edk2/code/trunk/edk2@18572 6f19259b-4bc3-4df7-8a09-765794883524

diff --git a/ArmPlatformPkg/ArmJunoPkg/AcpiTables/Madt.aslc b/ArmPlatformPkg/ArmJunoPkg/AcpiTables/Madt.aslc
index 406bd94f5636e4efe79ee8a291476a2662740c3f..d63a19b3904a62a2e460b18944d7c2f637a2f59b 100644 (file)
--- a/ArmPlatformPkg/ArmJunoPkg/AcpiTables/Madt.aslc
+++ b/ArmPlatformPkg/ArmJunoPkg/AcpiTables/Madt.aslc
@@ -26,19 +26,19 @@
   #pragma pack (1)\r
 \r
   typedef struct {\r
-    EFI_ACPI_1_0_MULTIPLE_APIC_DESCRIPTION_TABLE_HEADER   Header;\r
+    EFI_ACPI_5_0_MULTIPLE_APIC_DESCRIPTION_TABLE_HEADER   Header;\r
     EFI_ACPI_5_0_GIC_STRUCTURE                            GicInterfaces[FixedPcdGet32 (PcdCoreCount)];\r
     EFI_ACPI_5_0_GIC_DISTRIBUTOR_STRUCTURE                GicDistributor;\r
-  } EFI_ACPI_1_0_MULTIPLE_APIC_DESCRIPTION_TABLE;\r
+  } EFI_ACPI_5_0_MULTIPLE_APIC_DESCRIPTION_TABLE;\r
 \r
   #pragma pack ()\r
 \r
-  EFI_ACPI_1_0_MULTIPLE_APIC_DESCRIPTION_TABLE Madt = {\r
+  EFI_ACPI_5_0_MULTIPLE_APIC_DESCRIPTION_TABLE Madt = {\r
     {\r
       ARM_ACPI_HEADER (\r
-        EFI_ACPI_1_0_APIC_SIGNATURE,\r
-        EFI_ACPI_1_0_MULTIPLE_APIC_DESCRIPTION_TABLE,\r
-        EFI_ACPI_1_0_MULTIPLE_APIC_DESCRIPTION_TABLE_REVISION\r
+        EFI_ACPI_5_0_MULTIPLE_APIC_DESCRIPTION_TABLE_SIGNATURE,\r
+        EFI_ACPI_5_0_MULTIPLE_APIC_DESCRIPTION_TABLE,\r
+        EFI_ACPI_5_0_MULTIPLE_APIC_DESCRIPTION_TABLE_REVISION\r
       ),\r
       //\r
       // MADT specific fields\r
@@ -68,20 +68,20 @@
   #pragma pack (1)\r
 \r
   typedef struct {\r
-    EFI_ACPI_1_0_MULTIPLE_APIC_DESCRIPTION_TABLE_HEADER   Header;\r
+    EFI_ACPI_5_0_MULTIPLE_APIC_DESCRIPTION_TABLE_HEADER   Header;\r
     EFI_ACPI_5_1_GIC_STRUCTURE                            GicInterfaces[FixedPcdGet32 (PcdCoreCount)];\r
     EFI_ACPI_5_0_GIC_DISTRIBUTOR_STRUCTURE                GicDistributor;\r
     EFI_ACPI_6_0_GIC_MSI_FRAME_STRUCTURE                  MsiFrame;\r
-  } EFI_ACPI_1_0_MULTIPLE_APIC_DESCRIPTION_TABLE;\r
+  } EFI_ACPI_5_0_MULTIPLE_APIC_DESCRIPTION_TABLE;\r
 \r
   #pragma pack ()\r
 \r
-  EFI_ACPI_1_0_MULTIPLE_APIC_DESCRIPTION_TABLE Madt = {\r
+  EFI_ACPI_5_0_MULTIPLE_APIC_DESCRIPTION_TABLE Madt = {\r
     {\r
       ARM_ACPI_HEADER (\r
-        EFI_ACPI_1_0_APIC_SIGNATURE,\r
-        EFI_ACPI_1_0_MULTIPLE_APIC_DESCRIPTION_TABLE,\r
-        EFI_ACPI_1_0_MULTIPLE_APIC_DESCRIPTION_TABLE_REVISION\r
+        EFI_ACPI_5_0_MULTIPLE_APIC_DESCRIPTION_TABLE_SIGNATURE,\r
+        EFI_ACPI_5_0_MULTIPLE_APIC_DESCRIPTION_TABLE,\r
+        EFI_ACPI_5_0_MULTIPLE_APIC_DESCRIPTION_TABLE_REVISION\r
       ),\r
       //\r
       // MADT specific fields\r