From patchwork Fri Dec 2 04:13:00 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: gary guo X-Patchwork-Id: 86201 Delivered-To: patch@linaro.org Received: by 10.140.20.101 with SMTP id 92csp85888qgi; Thu, 1 Dec 2016 20:22:21 -0800 (PST) X-Received: by 10.200.42.202 with SMTP id c10mr36681952qta.251.1480652541224; Thu, 01 Dec 2016 20:22:21 -0800 (PST) Return-Path: Received: from lists.linaro.org (lists.linaro.org. [54.225.227.206]) by mx.google.com with ESMTP id 50si1995726qtp.278.2016.12.01.20.22.20; Thu, 01 Dec 2016 20:22:21 -0800 (PST) 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 C664863489; Fri, 2 Dec 2016 04:22:20 +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=-1.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL 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 9343F62EC4; Fri, 2 Dec 2016 04:17:12 +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 1044662E03; Fri, 2 Dec 2016 04:17:06 +0000 (UTC) Received: from mail-pg0-f46.google.com (mail-pg0-f46.google.com [74.125.83.46]) by lists.linaro.org (Postfix) with ESMTPS id 843B862DFF for ; Fri, 2 Dec 2016 04:15:11 +0000 (UTC) Received: by mail-pg0-f46.google.com with SMTP id x23so102751662pgx.1 for ; Thu, 01 Dec 2016 20:15:11 -0800 (PST) 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=/I33cE++vcNMdm2nhFvfwxS67nhnXql6wQ2ZbDBc1rM=; b=cBi4n+gEMeDy8fwmX3R+2Lr3Le//vdDaf+FhB0GjfBeFYxrK3G7UDAU8L3+rpz53cu 8lDdFYa11RCOJvR4aAy+ahAUyHPnalmv3aOR0KC+3de83gHuVH1RY59eHr7jmSTa5wR7 UREBC04TTwpe+sI8Aj2UFEEwweYOxBkTnEKYcwC2VeeEGLwjWlOQ7gogDREqNoG+t7+Z qhF6mXItqYciT3Eavdck2dMO0aXIoGL+yUPmVRQbd6dV091Pl3xdMfhC2GdS64yWFFfZ gKzwhA+9DBgwXRnJYaYgxwKlcqWFhu0rhnFyuMLb7PTyVEQoqzX1uSoit4ENDnlOyh0K jK3A== X-Gm-Message-State: AKaTC01SNFLJt95kSRBya4FLUGtRCrM8RqxvkfkPpj6g5wOFs0EYv8knkxelJ44BSVwHeS+/Wyo= X-Received: by 10.99.96.85 with SMTP id u82mr76074709pgb.47.1480652110641; Thu, 01 Dec 2016 20:15:10 -0800 (PST) Received: from localhost.localdomain ([119.145.15.121]) by smtp.gmail.com with ESMTPSA id u78sm3402349pfa.53.2016.12.01.20.15.08 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 01 Dec 2016 20:15:10 -0800 (PST) From: Heyi Guo To: linaro-uefi@lists.linaro.org Date: Fri, 2 Dec 2016 12:13:00 +0800 Message-Id: <1480652017-31676-8-git-send-email-heyi.guo@linaro.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1480652017-31676-1-git-send-email-heyi.guo@linaro.org> References: <1480652017-31676-1-git-send-email-heyi.guo@linaro.org> Cc: sunchenhui@huawei.com, wanghuiqiang@huawei.com Subject: [Linaro-uefi] [linaro-uefi v5 07/44] Hisilicon: Remove ArmVExpress including from build option 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" 1. D02/D03: Remove ARMVExpressPkg platform include path from build option. 2. Delete ArmPlatform.h header which is not used by Hisilicon platforms. Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: Heyi Guo Reviewed-by: Leif Lindholm --- Chips/Hisilicon/Library/ArmPlatformLibHisilicon/ArmPlatformLib.c | 1 - Chips/Hisilicon/Library/ArmPlatformLibHisilicon/ArmPlatformLibMem.c | 1 - Platforms/Hisilicon/D02/Pv660D02.dsc | 2 +- Platforms/Hisilicon/D03/D03.dsc | 2 +- 4 files changed, 2 insertions(+), 4 deletions(-) diff --git a/Chips/Hisilicon/Library/ArmPlatformLibHisilicon/ArmPlatformLib.c b/Chips/Hisilicon/Library/ArmPlatformLibHisilicon/ArmPlatformLib.c index 6c85958..07ab0d1 100644 --- a/Chips/Hisilicon/Library/ArmPlatformLibHisilicon/ArmPlatformLib.c +++ b/Chips/Hisilicon/Library/ArmPlatformLibHisilicon/ArmPlatformLib.c @@ -23,7 +23,6 @@ #include -#include UINTN ArmGetCpuCountPerCluster ( VOID diff --git a/Chips/Hisilicon/Library/ArmPlatformLibHisilicon/ArmPlatformLibMem.c b/Chips/Hisilicon/Library/ArmPlatformLibHisilicon/ArmPlatformLibMem.c index 5bbcab3..b7bc75d 100644 --- a/Chips/Hisilicon/Library/ArmPlatformLibHisilicon/ArmPlatformLibMem.c +++ b/Chips/Hisilicon/Library/ArmPlatformLibHisilicon/ArmPlatformLibMem.c @@ -22,7 +22,6 @@ #include #include #include -#include #include diff --git a/Platforms/Hisilicon/D02/Pv660D02.dsc b/Platforms/Hisilicon/D02/Pv660D02.dsc index 8f840a1..9c23fa7 100644 --- a/Platforms/Hisilicon/D02/Pv660D02.dsc +++ b/Platforms/Hisilicon/D02/Pv660D02.dsc @@ -86,7 +86,7 @@ I2CLib|OpenPlatformPkg/Chips/Hisilicon/Library/I2CLib/I2CLibRuntime.inf [BuildOptions] - GCC:*_*_AARCH64_PLATFORM_FLAGS == -I$(WORKSPACE)/ArmPlatformPkg/ArmVExpressPkg/Include -I$(WORKSPACE)/ArmPlatformPkg/ArmVExpressPkg/Include/Platform/RTSM -I$(WORKSPACE)/OpenPlatformPkg/Chips/Hisilicon/Pv660/Include + GCC:*_*_AARCH64_PLATFORM_FLAGS == -I$(WORKSPACE)/OpenPlatformPkg/Chips/Hisilicon/Pv660/Include ################################################################################ diff --git a/Platforms/Hisilicon/D03/D03.dsc b/Platforms/Hisilicon/D03/D03.dsc index 1c0d8e8..e7b8bdd 100644 --- a/Platforms/Hisilicon/D03/D03.dsc +++ b/Platforms/Hisilicon/D03/D03.dsc @@ -98,7 +98,7 @@ SerialPortLib|OpenPlatformPkg/Chips/Hisilicon/Binary/Hi1610/Library/Uart/LpcSerialPortLib/LpcSerialPortLib.inf [BuildOptions] - GCC:*_*_AARCH64_PLATFORM_FLAGS == -I$(WORKSPACE)/ArmPlatformPkg/ArmVExpressPkg/Include -I$(WORKSPACE)/ArmPlatformPkg/ArmVExpressPkg/Include/Platform/RTSM -I$(WORKSPACE)/OpenPlatformPkg/Chips/Hisilicon/Hi1610/Include + GCC:*_*_AARCH64_PLATFORM_FLAGS == -I$(WORKSPACE)/OpenPlatformPkg/Chips/Hisilicon/Hi1610/Include ################################################################################ #