From patchwork Thu Jul 28 03:13:21 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: gary guo X-Patchwork-Id: 72919 Delivered-To: patch@linaro.org Received: by 10.140.29.52 with SMTP id a49csp624277qga; Wed, 27 Jul 2016 20:18:07 -0700 (PDT) X-Received: by 10.55.19.206 with SMTP id 75mr4895783qkt.29.1469675887925; Wed, 27 Jul 2016 20:18:07 -0700 (PDT) Return-Path: Received: from lists.linaro.org (lists.linaro.org. [54.225.227.206]) by mx.google.com with ESMTP id l189si435217qke.229.2016.07.27.20.18.07; Wed, 27 Jul 2016 20:18:07 -0700 (PDT) Received-SPF: pass (google.com: domain of linaro-uefi-bounces@lists.linaro.org designates 54.225.227.206 as permitted sender) client-ip=54.225.227.206; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linaro-uefi-bounces@lists.linaro.org designates 54.225.227.206 as permitted sender) smtp.mailfrom=linaro-uefi-bounces@lists.linaro.org; dmarc=pass (p=NONE dis=NONE) header.from=linaro.org Received: by lists.linaro.org (Postfix, from userid 109) id B954E63A38; Thu, 28 Jul 2016 03:17:43 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on ip-10-142-244-252 X-Spam-Level: X-Spam-Status: No, score=-2.6 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_LOW, RCVD_IN_MSPIKE_H2, URIBL_BLOCKED autolearn=disabled version=3.4.0 Received: from [127.0.0.1] (localhost [127.0.0.1]) by lists.linaro.org (Postfix) with ESMTP id C954D68434; Thu, 28 Jul 2016 03:15:19 +0000 (UTC) X-Original-To: Linaro-uefi@lists.linaro.org Delivered-To: Linaro-uefi@lists.linaro.org Received: by lists.linaro.org (Postfix, from userid 109) id 9E1A1684EE; Thu, 28 Jul 2016 03:14:42 +0000 (UTC) Received: from mail-pf0-f173.google.com (mail-pf0-f173.google.com [209.85.192.173]) by lists.linaro.org (Postfix) with ESMTPS id 16B96684FA for ; Thu, 28 Jul 2016 03:14:24 +0000 (UTC) Received: by mail-pf0-f173.google.com with SMTP id x72so17064046pfd.2 for ; Wed, 27 Jul 2016 20:14:24 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=TdgFnFodYWJrFCCEuL+YiEI62VCPk4lptemRAf1Y7K8=; b=ihb4f0LrtOasBCJHkLAE+2t/B6Bl8zVpwzdE3+czhLisl0jEplCH8qZpFQPguVAq0W vgScwAM1xXhAmgXPmX55a+Gym6UxVHu9pEdzTXZXjrAK+tmsPWx0IDDRy9A0j1HyOIjw ugO8VPaONQPgUA2kvaUEI1o2F9abjE33x6kvGZfzEriWXpKgcn5hJfBGDBo0ew1gvomY +VG/w0gEVTp6YpdjgQVY+8vpijVENFq3koaKxUyS//waXRpvVRsb2KDijKn5NUsvr61o bLioQov1pWjvgsOvJV99kx+NjtsVRPPFLglfSV70FKfjvDj4GuHzpSiX6L6Kvc2deYkH Pbzg== X-Gm-Message-State: AEkoouv3z7rpghfgOUihNBiL5waB1ZFdywevImYby7IqBqrBZl7K0uVIhk+viIc+i8VWrVS8980= X-Received: by 10.98.31.219 with SMTP id l88mr55320768pfj.155.1469675663164; Wed, 27 Jul 2016 20:14:23 -0700 (PDT) Received: from localhost.localdomain ([104.237.91.232]) by smtp.gmail.com with ESMTPSA id d3sm12339246pfk.37.2016.07.27.20.14.20 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 27 Jul 2016 20:14:22 -0700 (PDT) From: Heyi Guo To: Linaro-uefi@lists.linaro.org Date: Thu, 28 Jul 2016 11:13:21 +0800 Message-Id: <1469675605-14588-5-git-send-email-heyi.guo@linaro.org> X-Mailer: git-send-email 2.7.0 In-Reply-To: <1469675605-14588-1-git-send-email-heyi.guo@linaro.org> References: <1469675605-14588-1-git-send-email-heyi.guo@linaro.org> Cc: Chenhui Sun Subject: [Linaro-uefi] [PATCH 5/9] Chips/Hi1610: Rename Pv660Platform.h to Hi1610Platform.h X-BeenThere: linaro-uefi@lists.linaro.org X-Mailman-Version: 2.1.16 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: linaro-uefi-bounces@lists.linaro.org Sender: "Linaro-uefi" 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 Signed-off-by: Heyi Guo --- .../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 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 -#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 #include 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 #include @@ -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 #include 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