[Linaro-uefi,linaro-uefi,v7,21/38] D02: Update ACPI table header id

Message ID 1481111375-71058-22-git-send-email-heyi.guo@linaro.org
State New
Headers show

Commit Message

Heyi Guo Dec. 7, 2016, 11:49 a.m.
Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Chenhui Sun <sunchenhui@huawei.com>
Reviewed-by: Graeme Gregory <graeme.gregory@linaro.org>
Reviewed-by: Leif Lindholm <leif.lindholm@linaro.org>
---
 Chips/Hisilicon/Pv660/Pv660AcpiTables/Dsdt/Dsdt.asl   | 2 +-
 Chips/Hisilicon/Pv660/Pv660AcpiTables/Iort.asl        | 2 +-
 Chips/Hisilicon/Pv660/Pv660AcpiTables/Pv660Platform.h | 4 ++--
 Chips/Hisilicon/Pv660/Pv660AcpiTables/SASSSDT.ASL     | 2 +-
 Chips/Hisilicon/Pv660/Pv660AcpiTables/SATASSDT.ASL    | 2 +-
 5 files changed, 6 insertions(+), 6 deletions(-)

Patch hide | download patch | download mbox

diff --git a/Chips/Hisilicon/Pv660/Pv660AcpiTables/Dsdt/Dsdt.asl b/Chips/Hisilicon/Pv660/Pv660AcpiTables/Dsdt/Dsdt.asl
index f156e1b..c0cc6d2 100644
--- a/Chips/Hisilicon/Pv660/Pv660AcpiTables/Dsdt/Dsdt.asl
+++ b/Chips/Hisilicon/Pv660/Pv660AcpiTables/Dsdt/Dsdt.asl
@@ -18,7 +18,7 @@ 
 
 #include "Pv660Platform.h"
 
-DefinitionBlock("DsdtTable.aml", "DSDT", 1, "HISI", "HISI0660", EFI_ACPI_ARM_OEM_REVISION) {
+DefinitionBlock("DsdtTable.aml", "DSDT", 1, "HISI  ", "HIP05   ", EFI_ACPI_ARM_OEM_REVISION) {
   include ("Mbig.asl")
   include ("CPU.asl")
   include ("Com.asl")
diff --git a/Chips/Hisilicon/Pv660/Pv660AcpiTables/Iort.asl b/Chips/Hisilicon/Pv660/Pv660AcpiTables/Iort.asl
index 9ba3d55..bcd31d6 100644
--- a/Chips/Hisilicon/Pv660/Pv660AcpiTables/Iort.asl
+++ b/Chips/Hisilicon/Pv660/Pv660AcpiTables/Iort.asl
@@ -11,7 +11,7 @@ 
 [0001]                           Revision : 00
 [0001]                           Checksum : BC
 [0006]                             Oem ID : "HISI  "
-[0008]                       Oem Table ID : "HISI0660"
+[0008]                       Oem Table ID : "HIP05   "
 [0004]                       Oem Revision : 00000000
 [0004]                    Asl Compiler ID : "INTL"
 [0004]              Asl Compiler Revision : 20151124
diff --git a/Chips/Hisilicon/Pv660/Pv660AcpiTables/Pv660Platform.h b/Chips/Hisilicon/Pv660/Pv660AcpiTables/Pv660Platform.h
index 3d69d96..5c5b0f1 100644
--- a/Chips/Hisilicon/Pv660/Pv660AcpiTables/Pv660Platform.h
+++ b/Chips/Hisilicon/Pv660/Pv660AcpiTables/Pv660Platform.h
@@ -23,8 +23,8 @@ 
 //
 // ACPI table information used to initialize tables.
 //
-#define EFI_ACPI_ARM_OEM_ID           'H','I','S','I'   // OEMID 6 bytes long
-#define EFI_ACPI_ARM_OEM_TABLE_ID     SIGNATURE_64('H','I','S','I','0','6','6','0') // OEM table id 8 bytes long
+#define EFI_ACPI_ARM_OEM_ID           'H','I','S','I',' ',' '   // OEMID 6 bytes long
+#define EFI_ACPI_ARM_OEM_TABLE_ID     SIGNATURE_64('H','I','P','0','5',' ',' ',' ') // OEM table id 8 bytes long
 #define EFI_ACPI_ARM_OEM_REVISION     0x00000000
 #define EFI_ACPI_ARM_CREATOR_ID       SIGNATURE_32('I','N','T','L')
 #define EFI_ACPI_ARM_CREATOR_REVISION 0x20151124
diff --git a/Chips/Hisilicon/Pv660/Pv660AcpiTables/SASSSDT.ASL b/Chips/Hisilicon/Pv660/Pv660AcpiTables/SASSSDT.ASL
index 29b3ff4..fa2c2d8 100644
--- a/Chips/Hisilicon/Pv660/Pv660AcpiTables/SASSSDT.ASL
+++ b/Chips/Hisilicon/Pv660/Pv660AcpiTables/SASSSDT.ASL
@@ -20,7 +20,7 @@  DefinitionBlock (
     "SASSSDT.aml", // Output Filename
     "SSDT",         // Signature
     0x01,           // SSDT Compliance Revision
-    "HISI",       // OEM ID
+    "HISI  ",       // OEM ID
     "SAS0",     // Table ID
     EFI_ACPI_ARM_OEM_REVISION          // OEM Revision
     )
diff --git a/Chips/Hisilicon/Pv660/Pv660AcpiTables/SATASSDT.ASL b/Chips/Hisilicon/Pv660/Pv660AcpiTables/SATASSDT.ASL
index e82ee4c..f00664c 100644
--- a/Chips/Hisilicon/Pv660/Pv660AcpiTables/SATASSDT.ASL
+++ b/Chips/Hisilicon/Pv660/Pv660AcpiTables/SATASSDT.ASL
@@ -21,7 +21,7 @@  DefinitionBlock (
     "SATASSDT.aml", // Output Filename
     "SSDT",         // Signature
     0x01,           // DSDT Compliance Revision
-    "HISI",       // OEM ID
+    "HISI  ",       // OEM ID
     "SATA",     // Table ID
     EFI_ACPI_ARM_OEM_REVISION          // OEM Revision
     )