[Linaro-uefi,5/9] Chips/Hi1610: Rename Pv660Platform.h to Hi1610Platform.h

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

Commit Message

gary guo July 28, 2016, 3:13 a.m.
Rename Pv660Platform.h to Hi1610Platform.h; also rename related macro
definitions. Files referencing this header are also be fixed.

Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Chenhui Sun <sunchenhui@huawei.com>
Signed-off-by: Heyi Guo <heyi.guo@linaro.org>
---
 .../Hisilicon/Hi1610/Hi1610AcpiTables/D03Mcfg.aslc |  2 +-
 .../Hi1610/Hi1610AcpiTables/Dsdt/DsdtHi1610.asl    |  2 +-
 Chips/Hisilicon/Hi1610/Hi1610AcpiTables/Fadt.aslc  |  3 +-
 Chips/Hisilicon/Hi1610/Hi1610AcpiTables/Gtdt.aslc  |  4 +-
 .../Hi1610/Hi1610AcpiTables/Hi1610Platform.h       | 48 ++++++++++++++++++++++
 .../Hi1610/Hi1610AcpiTables/MadtHi1610.aslc        |  2 +-
 .../Hi1610/Hi1610AcpiTables/Pv660Platform.h        | 48 ----------------------
 7 files changed, 54 insertions(+), 55 deletions(-)
 create mode 100644 Chips/Hisilicon/Hi1610/Hi1610AcpiTables/Hi1610Platform.h
 delete mode 100644 Chips/Hisilicon/Hi1610/Hi1610AcpiTables/Pv660Platform.h

Patch

diff --git a/Chips/Hisilicon/Hi1610/Hi1610AcpiTables/D03Mcfg.aslc b/Chips/Hisilicon/Hi1610/Hi1610AcpiTables/D03Mcfg.aslc
index 9f60803..ed47a44 100644
--- a/Chips/Hisilicon/Hi1610/Hi1610AcpiTables/D03Mcfg.aslc
+++ b/Chips/Hisilicon/Hi1610/Hi1610AcpiTables/D03Mcfg.aslc
@@ -9,7 +9,7 @@ 
  */
 
 #include <IndustryStandard/Acpi.h>
-#include "Pv660Platform.h"
+#include "Hi1610Platform.h"
 
 #define ACPI_5_0_MCFG_VERSION  0x1
 
diff --git a/Chips/Hisilicon/Hi1610/Hi1610AcpiTables/Dsdt/DsdtHi1610.asl b/Chips/Hisilicon/Hi1610/Hi1610AcpiTables/Dsdt/DsdtHi1610.asl
index 06c05aa..474d493 100644
--- a/Chips/Hisilicon/Hi1610/Hi1610AcpiTables/Dsdt/DsdtHi1610.asl
+++ b/Chips/Hisilicon/Hi1610/Hi1610AcpiTables/Dsdt/DsdtHi1610.asl
@@ -16,7 +16,7 @@ 
 
 **/
 
-#include "Pv660Platform.h"
+#include "Hi1610Platform.h"
 
 DefinitionBlock("DsdtTable.aml", "DSDT", 1, "HISI", "HISI-EVB", EFI_ACPI_ARM_OEM_REVISION) {
      include ("Lpc.asl")
diff --git a/Chips/Hisilicon/Hi1610/Hi1610AcpiTables/Fadt.aslc b/Chips/Hisilicon/Hi1610/Hi1610AcpiTables/Fadt.aslc
index 5907c65..5307041 100644
--- a/Chips/Hisilicon/Hi1610/Hi1610AcpiTables/Fadt.aslc
+++ b/Chips/Hisilicon/Hi1610/Hi1610AcpiTables/Fadt.aslc
@@ -17,8 +17,7 @@ 
 *
 **/
 
-//#include "ArmPlatform.h"
-#include "Pv660Platform.h"
+#include "Hi1610Platform.h"
 
 #include <Library/AcpiLib.h>
 #include <IndustryStandard/Acpi.h>
diff --git a/Chips/Hisilicon/Hi1610/Hi1610AcpiTables/Gtdt.aslc b/Chips/Hisilicon/Hi1610/Hi1610AcpiTables/Gtdt.aslc
index 3caf144..4032382 100644
--- a/Chips/Hisilicon/Hi1610/Hi1610AcpiTables/Gtdt.aslc
+++ b/Chips/Hisilicon/Hi1610/Hi1610AcpiTables/Gtdt.aslc
@@ -17,7 +17,7 @@ 
 *
 **/
 
-#include "Pv660Platform.h"
+#include "Hi1610Platform.h"
 
 #include <Library/AcpiLib.h>
 #include <Library/PcdLib.h>
@@ -47,7 +47,7 @@ 
 
 typedef struct {
   EFI_ACPI_5_1_GENERIC_TIMER_DESCRIPTION_TABLE          Gtdt;
-  EFI_ACPI_5_1_GTDT_SBSA_GENERIC_WATCHDOG_STRUCTURE     Watchdogs[PV660_WATCHDOG_COUNT];
+  EFI_ACPI_5_1_GTDT_SBSA_GENERIC_WATCHDOG_STRUCTURE     Watchdogs[HI1610_WATCHDOG_COUNT];
 } EFI_ACPI_5_1_GENERIC_TIMER_DESCRIPTION_TABLES;
 
 #pragma pack ()
diff --git a/Chips/Hisilicon/Hi1610/Hi1610AcpiTables/Hi1610Platform.h b/Chips/Hisilicon/Hi1610/Hi1610AcpiTables/Hi1610Platform.h
new file mode 100644
index 0000000..37ec5f0
--- /dev/null
+++ b/Chips/Hisilicon/Hi1610/Hi1610AcpiTables/Hi1610Platform.h
@@ -0,0 +1,48 @@ 
+/** @file
+*
+*  Copyright (c) 2011-2015, ARM Limited. All rights reserved.
+*  Copyright (c) 2015, Hisilicon Limited. All rights reserved.
+*  Copyright (c) 2015, Linaro Limited. All rights reserved.
+*
+*  This program and the accompanying materials
+*  are licensed and made available under the terms and conditions of the BSD License
+*  which accompanies this distribution.  The full text of the license may be found at
+*  http://opensource.org/licenses/bsd-license.php
+*
+*  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
+*  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+*
+*  Based on the files under ArmPlatformPkg/ArmJunoPkg/AcpiTables/
+*
+**/
+
+
+#ifndef _HI1610_PLATFORM_H_
+#define _HI1610_PLATFORM_H_
+
+//
+// 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
+
+// A macro to initialise the common header part of EFI ACPI tables as defined by
+// EFI_ACPI_DESCRIPTION_HEADER structure.
+#define ARM_ACPI_HEADER(Signature, Type, Revision) {              \
+    Signature,                      /* UINT32  Signature */       \
+    sizeof (Type),                  /* UINT32  Length */          \
+    Revision,                       /* UINT8   Revision */        \
+    0,                              /* UINT8   Checksum */        \
+    { EFI_ACPI_ARM_OEM_ID },        /* UINT8   OemId[6] */        \
+    EFI_ACPI_ARM_OEM_TABLE_ID,      /* UINT64  OemTableId */      \
+    EFI_ACPI_ARM_OEM_REVISION,      /* UINT32  OemRevision */     \
+    EFI_ACPI_ARM_CREATOR_ID,        /* UINT32  CreatorId */       \
+    EFI_ACPI_ARM_CREATOR_REVISION   /* UINT32  CreatorRevision */ \
+  }
+
+#define HI1610_WATCHDOG_COUNT  2
+
+#endif
diff --git a/Chips/Hisilicon/Hi1610/Hi1610AcpiTables/MadtHi1610.aslc b/Chips/Hisilicon/Hi1610/Hi1610AcpiTables/MadtHi1610.aslc
index 5861636..7bebe8f 100644
--- a/Chips/Hisilicon/Hi1610/Hi1610AcpiTables/MadtHi1610.aslc
+++ b/Chips/Hisilicon/Hi1610/Hi1610AcpiTables/MadtHi1610.aslc
@@ -19,7 +19,7 @@ 
 *
 **/
 
-#include "Pv660Platform.h"
+#include "Hi1610Platform.h"
 
 #include <Library/AcpiLib.h>
 #include <Library/ArmLib.h>
diff --git a/Chips/Hisilicon/Hi1610/Hi1610AcpiTables/Pv660Platform.h b/Chips/Hisilicon/Hi1610/Hi1610AcpiTables/Pv660Platform.h
deleted file mode 100644
index 5af8f1a..0000000
--- a/Chips/Hisilicon/Hi1610/Hi1610AcpiTables/Pv660Platform.h
+++ /dev/null
@@ -1,48 +0,0 @@ 
-/** @file
-*
-*  Copyright (c) 2011-2015, ARM Limited. All rights reserved.
-*  Copyright (c) 2015, Hisilicon Limited. All rights reserved.
-*  Copyright (c) 2015, Linaro Limited. All rights reserved.
-*
-*  This program and the accompanying materials
-*  are licensed and made available under the terms and conditions of the BSD License
-*  which accompanies this distribution.  The full text of the license may be found at
-*  http://opensource.org/licenses/bsd-license.php
-*
-*  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-*  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
-*
-*  Based on the files under ArmPlatformPkg/ArmJunoPkg/AcpiTables/
-*
-**/
-
-
-#ifndef _PV660_PLATFORM_H_
-#define _PV660_PLATFORM_H_
-
-//
-// 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
-
-// A macro to initialise the common header part of EFI ACPI tables as defined by
-// EFI_ACPI_DESCRIPTION_HEADER structure.
-#define ARM_ACPI_HEADER(Signature, Type, Revision) {              \
-    Signature,                      /* UINT32  Signature */       \
-    sizeof (Type),                  /* UINT32  Length */          \
-    Revision,                       /* UINT8   Revision */        \
-    0,                              /* UINT8   Checksum */        \
-    { EFI_ACPI_ARM_OEM_ID },        /* UINT8   OemId[6] */        \
-    EFI_ACPI_ARM_OEM_TABLE_ID,      /* UINT64  OemTableId */      \
-    EFI_ACPI_ARM_OEM_REVISION,      /* UINT32  OemRevision */     \
-    EFI_ACPI_ARM_CREATOR_ID,        /* UINT32  CreatorId */       \
-    EFI_ACPI_ARM_CREATOR_REVISION   /* UINT32  CreatorRevision */ \
-  }
-
-#define PV660_WATCHDOG_COUNT  2
-
-#endif