[Linaro-uefi,9/9] Chips/Hi1610: Unify ACPI table header

Message ID 1469675605-14588-9-git-send-email-heyi.guo@linaro.org
State New
Headers show

Commit Message

gary guo July 28, 2016, 3:13 a.m.
ACPI spec suggests to have CREATOR_ID and CREATOR_REVISION to indicate
ASL compiler information. OEM_ID, OEM_TABLE_ID and OEM_REVISION are
sometimes used for OS quirks. So we unify fields of ACPI table header
for Hi1610 as below:

OEM_ID           HISI
OEM_TABLE_ID     HISI1610
OEM_REVISION     0x00000000
CREATOR_ID       INTL
CREATOR_REVISION 0x20151124

Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Chenhui Sun <sunchenhui@huawei.com>
Signed-off-by: Heyi Guo <heyi.guo@linaro.org>
---
 Chips/Hisilicon/Hi1610/Hi1610AcpiTables/D03Iort.asl         | 4 ++--
 Chips/Hisilicon/Hi1610/Hi1610AcpiTables/Dsdt/DsdtHi1610.asl | 2 +-
 Chips/Hisilicon/Hi1610/Hi1610AcpiTables/Hi1610Platform.h    | 8 ++++----
 3 files changed, 7 insertions(+), 7 deletions(-)

Patch

diff --git a/Chips/Hisilicon/Hi1610/Hi1610AcpiTables/D03Iort.asl b/Chips/Hisilicon/Hi1610/Hi1610AcpiTables/D03Iort.asl
index 07660df..e02b4d5 100644
--- a/Chips/Hisilicon/Hi1610/Hi1610AcpiTables/D03Iort.asl
+++ b/Chips/Hisilicon/Hi1610/Hi1610AcpiTables/D03Iort.asl
@@ -11,10 +11,10 @@ 
 [0001]                           Revision : 00
 [0001]                           Checksum : BC
 [0006]                             Oem ID : "HISI "
-[0008]                       Oem Table ID : "D03"
+[0008]                       Oem Table ID : "HISI1610"
 [0004]                       Oem Revision : 00000000
 [0004]                    Asl Compiler ID : "INTL"
-[0004]              Asl Compiler Revision : 20150410
+[0004]              Asl Compiler Revision : 20151124
 
 [0004]                         Node Count : 00000008
 [0004]                        Node Offset : 00000034
diff --git a/Chips/Hisilicon/Hi1610/Hi1610AcpiTables/Dsdt/DsdtHi1610.asl b/Chips/Hisilicon/Hi1610/Hi1610AcpiTables/Dsdt/DsdtHi1610.asl
index 474d493..ca8b2dc 100644
--- a/Chips/Hisilicon/Hi1610/Hi1610AcpiTables/Dsdt/DsdtHi1610.asl
+++ b/Chips/Hisilicon/Hi1610/Hi1610AcpiTables/Dsdt/DsdtHi1610.asl
@@ -18,7 +18,7 @@ 
 
 #include "Hi1610Platform.h"
 
-DefinitionBlock("DsdtTable.aml", "DSDT", 1, "HISI", "HISI-EVB", EFI_ACPI_ARM_OEM_REVISION) {
+DefinitionBlock("DsdtTable.aml", "DSDT", 1, "HISI", "HISI1610", EFI_ACPI_ARM_OEM_REVISION) {
      include ("Lpc.asl")
      include ("D03Mbig.asl")
      include ("CPU.asl")
diff --git a/Chips/Hisilicon/Hi1610/Hi1610AcpiTables/Hi1610Platform.h b/Chips/Hisilicon/Hi1610/Hi1610AcpiTables/Hi1610Platform.h
index 37ec5f0..e8a1577 100644
--- a/Chips/Hisilicon/Hi1610/Hi1610AcpiTables/Hi1610Platform.h
+++ b/Chips/Hisilicon/Hi1610/Hi1610AcpiTables/Hi1610Platform.h
@@ -24,10 +24,10 @@ 
 // 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','-','D','0','2') // OEM table id 8 bytes long
-#define EFI_ACPI_ARM_OEM_REVISION     0x20140727
-#define EFI_ACPI_ARM_CREATOR_ID       SIGNATURE_32('H','I','S','I')
-#define EFI_ACPI_ARM_CREATOR_REVISION 0x00000099
+#define EFI_ACPI_ARM_OEM_TABLE_ID     SIGNATURE_64('H','I','S','I','1','6','1','0') // 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
 
 // A macro to initialise the common header part of EFI ACPI tables as defined by
 // EFI_ACPI_DESCRIPTION_HEADER structure.