[Linaro-uefi,14/28] D03: Update ACPI Oem table header id

Message ID 1479122995-50330-15-git-send-email-heyi.guo@linaro.org
State Superseded
Headers show

Commit Message

gary guo Nov. 14, 2016, 11:29 a.m.
Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Chenhui Sun <sunchenhui@huawei.com>
---
 Chips/Hisilicon/Hi1610/Hi1610AcpiTables/D03Iort.asl         | 4 ++--
 Chips/Hisilicon/Hi1610/Hi1610AcpiTables/Dsdt/DsdtHi1610.asl | 2 +-
 Chips/Hisilicon/Hi1610/Hi1610AcpiTables/Hi1610Platform.h    | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

Comments

Graeme Gregory Nov. 16, 2016, 10:41 a.m. | #1
Review-by: Graeme Gregory <graeme.gregory@linaro.org>

On Mon, Nov 14, 2016 at 07:29:41PM +0800, Heyi Guo wrote:
> Contributed-under: TianoCore Contribution Agreement 1.0
> Signed-off-by: Chenhui Sun <sunchenhui@huawei.com>
> ---
>  Chips/Hisilicon/Hi1610/Hi1610AcpiTables/D03Iort.asl         | 4 ++--
>  Chips/Hisilicon/Hi1610/Hi1610AcpiTables/Dsdt/DsdtHi1610.asl | 2 +-
>  Chips/Hisilicon/Hi1610/Hi1610AcpiTables/Hi1610Platform.h    | 4 ++--
>  3 files changed, 5 insertions(+), 5 deletions(-)
> 
> diff --git a/Chips/Hisilicon/Hi1610/Hi1610AcpiTables/D03Iort.asl b/Chips/Hisilicon/Hi1610/Hi1610AcpiTables/D03Iort.asl
> index db98305..09245b8 100644
> --- a/Chips/Hisilicon/Hi1610/Hi1610AcpiTables/D03Iort.asl
> +++ b/Chips/Hisilicon/Hi1610/Hi1610AcpiTables/D03Iort.asl
> @@ -10,8 +10,8 @@
>  [0004]                       Table Length : 000002e4
>  [0001]                           Revision : 00
>  [0001]                           Checksum : BC
> -[0006]                             Oem ID : "HISI "
> -[0008]                       Oem Table ID : "HISI1610"
> +[0006]                             Oem ID : "HISI  "
> +[0008]                       Oem Table ID : "HIP06   "
>  [0004]                       Oem Revision : 00000000
>  [0004]                    Asl Compiler ID : "INTL"
>  [0004]              Asl Compiler Revision : 20151124
> diff --git a/Chips/Hisilicon/Hi1610/Hi1610AcpiTables/Dsdt/DsdtHi1610.asl b/Chips/Hisilicon/Hi1610/Hi1610AcpiTables/Dsdt/DsdtHi1610.asl
> index ca8b2dc..4185f80 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", "HISI1610", EFI_ACPI_ARM_OEM_REVISION) {
> +DefinitionBlock("DsdtTable.aml", "DSDT", 1, "HISI  ", "HIP06   ", 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 e8a1577..5a95b02 100644
> --- a/Chips/Hisilicon/Hi1610/Hi1610AcpiTables/Hi1610Platform.h
> +++ b/Chips/Hisilicon/Hi1610/Hi1610AcpiTables/Hi1610Platform.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','1','6','1','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','6',' ',' ',' ') // 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
> -- 
> 1.9.1
>

Patch

diff --git a/Chips/Hisilicon/Hi1610/Hi1610AcpiTables/D03Iort.asl b/Chips/Hisilicon/Hi1610/Hi1610AcpiTables/D03Iort.asl
index db98305..09245b8 100644
--- a/Chips/Hisilicon/Hi1610/Hi1610AcpiTables/D03Iort.asl
+++ b/Chips/Hisilicon/Hi1610/Hi1610AcpiTables/D03Iort.asl
@@ -10,8 +10,8 @@ 
 [0004]                       Table Length : 000002e4
 [0001]                           Revision : 00
 [0001]                           Checksum : BC
-[0006]                             Oem ID : "HISI "
-[0008]                       Oem Table ID : "HISI1610"
+[0006]                             Oem ID : "HISI  "
+[0008]                       Oem Table ID : "HIP06   "
 [0004]                       Oem Revision : 00000000
 [0004]                    Asl Compiler ID : "INTL"
 [0004]              Asl Compiler Revision : 20151124
diff --git a/Chips/Hisilicon/Hi1610/Hi1610AcpiTables/Dsdt/DsdtHi1610.asl b/Chips/Hisilicon/Hi1610/Hi1610AcpiTables/Dsdt/DsdtHi1610.asl
index ca8b2dc..4185f80 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", "HISI1610", EFI_ACPI_ARM_OEM_REVISION) {
+DefinitionBlock("DsdtTable.aml", "DSDT", 1, "HISI  ", "HIP06   ", 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 e8a1577..5a95b02 100644
--- a/Chips/Hisilicon/Hi1610/Hi1610AcpiTables/Hi1610Platform.h
+++ b/Chips/Hisilicon/Hi1610/Hi1610AcpiTables/Hi1610Platform.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','1','6','1','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','6',' ',' ',' ') // 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