From patchwork Mon Jul 3 15:17:56 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ard Biesheuvel X-Patchwork-Id: 106910 Delivered-To: patch@linaro.org Received: by 10.182.135.102 with SMTP id pr6csp11392obb; Mon, 3 Jul 2017 08:19:04 -0700 (PDT) X-Received: by 10.107.189.68 with SMTP id n65mr39300645iof.223.1499095143976; Mon, 03 Jul 2017 08:19:03 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1499095143; cv=none; d=google.com; s=arc-20160816; b=t5GTWUaCa62SbEpZK6CkFlxnmAyt4uVGOnmjd+oCj2AFY/XFiuxBKdK0U+Ps8wi52C jaG0fdJbcHvlV8PQjaigiZj8/aqfuKXfllaa/famwv9WF77Va2V6GS8tAaoDcLgzBj20 OR46/Yf4A5m38bBPh68z1kOaUSXRqYbt413TRWlrfDnGIWVXqOLXVb/pkF5UXJjXLgoi 4KOn74RTEwcdl9uZK4Dd9fhi7EHYj5iJN9D6ZxBqBTodR0Nh2OHmVcCGnjP/YPLArzxL Zo6DumHiQHwRkHyYQJPukwdcVppXo1vkwqvFZdW3e7irRsE8PXuokGGSHnGBR5BG4i9J SYtQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:cc:references:in-reply-to:message-id :date:to:from:delivered-to:arc-authentication-results; bh=Rotex1J4onUAYlP/uESN43eo3ILTRjKvdt5TpycREik=; b=JDY7df6xDoMcTjGra4YaGgYoStJtdzJxH6WRhcKXP7e6+dyxZOIEqgbsqXYz0ctOVV p9tpyXAMd6jQ4yjyuHpH9ELjev2p2k/lO+xNbylJrOG6Ko6KPoMbSY1fs2BRZZx2cqgA aQgZRRVnqTCjOTp5KzbuwHDy3Ht9SEKOv3Uldojfok7lVRaZ0hPja6xWqqQFXqrKfZLQ CZLoBdMV3hAoI4+8WR+4PWThfUExMkmjXTnyUEgpOxxW25/mV0947XAs2WhkOlHzyHVG VI5hyW8/5uD53UupZKwAkrQKpj+op13Z4me433ff/Qbmc33cHM20mtqieUlD5XA5P6FD wkKw== ARC-Authentication-Results: i=1; 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 sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.linaro.org (lists.linaro.org. [54.225.227.206]) by mx.google.com with ESMTP id c92si18915561itd.67.2017.07.03.08.19.02; Mon, 03 Jul 2017 08:19:03 -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 sp=NONE dis=NONE) header.from=linaro.org Received: by lists.linaro.org (Postfix, from userid 109) id DD05B60B0F; Mon, 3 Jul 2017 15:19:01 +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.4 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL, RCVD_IN_SORBS_SPAM, 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 2132960AFA; Mon, 3 Jul 2017 15:18:29 +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 0F94D60AF7; Mon, 3 Jul 2017 15:18:24 +0000 (UTC) Received: from mail-wm0-f49.google.com (mail-wm0-f49.google.com [74.125.82.49]) by lists.linaro.org (Postfix) with ESMTPS id AF53D60AFA for ; Mon, 3 Jul 2017 15:18:08 +0000 (UTC) Received: by mail-wm0-f49.google.com with SMTP id z75so38832761wmc.0 for ; Mon, 03 Jul 2017 08:18:08 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=mR+1zF1AB28/+N4+oSa0mUeXhPlo08ctlmKtePUjjTU=; b=jiYqlAfysaNPAiVhYPNU0WugGvWSxAw45USISS+IRiGF7nhIqKUgRXcvx9gIGVupDc CadeaQp8/OqQ6w5VcSQeIRsrFV1L9zDUhA+WxOiSrIPZOHxgFXP5Y3WyC7ZZDAoUzkF3 fg8bvwBKzcF0wkk+zuKHMOhWiKTX5yqPhABjsnHKT/ctBjU8NYJ9bfKkxYrmtLbQmlcg Xng0DhowwMtwzrBNFFf1Btuj5KUDdilLxKFkHQ7fn2YZ6j5/MKz9ZIxnS6Nzt3CiR5WO S6zUqtbKDA/PaKeot7qBPrdYuMfdfxngDEjC/IeZLBgITCfwoH7JiuqzyUOvvrkRFkL9 O1Xg== X-Gm-Message-State: AIVw112onKXi+rlD2mkwbBmaqptzF/JhZn2lwDaAW+6hpjCtbswutXcQ ij5jdHYP4ZGSKqWwjmswMaZC X-Received: by 10.28.217.3 with SMTP id q3mr5792730wmg.115.1499095087265; Mon, 03 Jul 2017 08:18:07 -0700 (PDT) Received: from localhost.localdomain ([154.151.196.199]) by smtp.gmail.com with ESMTPSA id o4sm17809309wrb.27.2017.07.03.08.18.05 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 03 Jul 2017 08:18:06 -0700 (PDT) From: Ard Biesheuvel To: linaro-uefi@lists.linaro.org, leif.lindholm@linaro.org Date: Mon, 3 Jul 2017 16:17:56 +0100 Message-Id: <20170703151757.8413-3-ard.biesheuvel@linaro.org> X-Mailer: git-send-email 2.9.3 In-Reply-To: <20170703151757.8413-1-ard.biesheuvel@linaro.org> References: <20170703151757.8413-1-ard.biesheuvel@linaro.org> Cc: alan@softiron.co.uk, chenhui.sun@linaro.org Subject: [Linaro-uefi] [PATCH 2/3] Platforms/Hisilicon: switch to generic ResetSystemRuntimeDxe X-BeenThere: linaro-uefi@lists.linaro.org X-Mailman-Version: 2.1.16 Precedence: list List-Id: "For discussions about Linaro-related UEFI development. Not a substitute for edk2-devel." 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" Switch to the generic implementation of the ResetSystem() runtime service call, which is preferred over the one in EmbeddedPkg. This involves selecting another DXE runtime driver, and another library class resolution for the platform glue. Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: Ard Biesheuvel --- Chips/Hisilicon/Hisilicon.dsc.inc | 2 +- Platforms/Hisilicon/D02/Pv660D02.dsc | 2 +- Platforms/Hisilicon/D02/Pv660D02.fdf | 2 +- Platforms/Hisilicon/D03/D03.dsc | 2 +- Platforms/Hisilicon/D03/D03.fdf | 2 +- Platforms/Hisilicon/D05/D05.dsc | 2 +- Platforms/Hisilicon/D05/D05.fdf | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/Chips/Hisilicon/Hisilicon.dsc.inc b/Chips/Hisilicon/Hisilicon.dsc.inc index b13be3143cd5..094efb42977b 100644 --- a/Chips/Hisilicon/Hisilicon.dsc.inc +++ b/Chips/Hisilicon/Hisilicon.dsc.inc @@ -68,7 +68,7 @@ # Versatile Express Specific Libraries ArmPlatformSysConfigLib|ArmPlatformPkg/ArmVExpressPkg/Library/ArmVExpressSysConfigLib/ArmVExpressSysConfigLib.inf NorFlashPlatformLib|ArmPlatformPkg/ArmVExpressPkg/Library/NorFlashArmVExpressLib/NorFlashArmVExpressLib.inf - EfiResetSystemLib|ArmPkg/Library/ArmPsciResetSystemLib/ArmPsciResetSystemLib.inf + ResetSystemLib|ArmPkg/Library/ArmSmcPsciResetSystemLib/ArmSmcPsciResetSystemLib.inf # ARM PL111 Lcd Driver LcdPlatformLib|ArmPlatformPkg/ArmVExpressPkg/Library/PL111LcdArmVExpressLib/PL111LcdArmVExpressLib.inf diff --git a/Platforms/Hisilicon/D02/Pv660D02.dsc b/Platforms/Hisilicon/D02/Pv660D02.dsc index b61157905829..6e942a0ad6c3 100644 --- a/Platforms/Hisilicon/D02/Pv660D02.dsc +++ b/Platforms/Hisilicon/D02/Pv660D02.dsc @@ -321,7 +321,7 @@ EmbeddedPkg/EmbeddedMonotonicCounter/EmbeddedMonotonicCounter.inf MdeModulePkg/Universal/MonotonicCounterRuntimeDxe/MonotonicCounterRuntimeDxe.inf - EmbeddedPkg/ResetRuntimeDxe/ResetRuntimeDxe.inf + MdeModulePkg/Universal/ResetSystemRuntimeDxe/ResetSystemRuntimeDxe.inf EmbeddedPkg/RealTimeClockRuntimeDxe/RealTimeClockRuntimeDxe.inf EmbeddedPkg/MetronomeDxe/MetronomeDxe.inf diff --git a/Platforms/Hisilicon/D02/Pv660D02.fdf b/Platforms/Hisilicon/D02/Pv660D02.fdf index 406b501f8b7d..7e90a1918652 100644 --- a/Platforms/Hisilicon/D02/Pv660D02.fdf +++ b/Platforms/Hisilicon/D02/Pv660D02.fdf @@ -175,7 +175,7 @@ READ_LOCK_STATUS = TRUE INF MdeModulePkg/Universal/CapsuleRuntimeDxe/CapsuleRuntimeDxe.inf INF EmbeddedPkg/EmbeddedMonotonicCounter/EmbeddedMonotonicCounter.inf - INF EmbeddedPkg/ResetRuntimeDxe/ResetRuntimeDxe.inf + INF MdeModulePkg/Universal/ResetSystemRuntimeDxe/ResetSystemRuntimeDxe.inf INF EmbeddedPkg/RealTimeClockRuntimeDxe/RealTimeClockRuntimeDxe.inf INF EmbeddedPkg/MetronomeDxe/MetronomeDxe.inf diff --git a/Platforms/Hisilicon/D03/D03.dsc b/Platforms/Hisilicon/D03/D03.dsc index ca6295e07ce9..42553e9e0753 100644 --- a/Platforms/Hisilicon/D03/D03.dsc +++ b/Platforms/Hisilicon/D03/D03.dsc @@ -374,7 +374,7 @@ MdeModulePkg/Universal/FaultTolerantWriteDxe/FaultTolerantWriteDxe.inf MdeModulePkg/Universal/MonotonicCounterRuntimeDxe/MonotonicCounterRuntimeDxe.inf - EmbeddedPkg/ResetRuntimeDxe/ResetRuntimeDxe.inf + MdeModulePkg/Universal/ResetSystemRuntimeDxe/ResetSystemRuntimeDxe.inf EmbeddedPkg/RealTimeClockRuntimeDxe/RealTimeClockRuntimeDxe.inf { CpldIoLib|OpenPlatformPkg/Chips/Hisilicon/Library/CpldIoLib/CpldIoLibRuntime.inf diff --git a/Platforms/Hisilicon/D03/D03.fdf b/Platforms/Hisilicon/D03/D03.fdf index 3102f9459925..691c5ca46482 100644 --- a/Platforms/Hisilicon/D03/D03.fdf +++ b/Platforms/Hisilicon/D03/D03.fdf @@ -169,7 +169,7 @@ READ_LOCK_STATUS = TRUE INF MdeModulePkg/Universal/CapsuleRuntimeDxe/CapsuleRuntimeDxe.inf INF MdeModulePkg/Universal/MonotonicCounterRuntimeDxe/MonotonicCounterRuntimeDxe.inf - INF EmbeddedPkg/ResetRuntimeDxe/ResetRuntimeDxe.inf + INF MdeModulePkg/Universal/ResetSystemRuntimeDxe/ResetSystemRuntimeDxe.inf INF EmbeddedPkg/RealTimeClockRuntimeDxe/RealTimeClockRuntimeDxe.inf INF EmbeddedPkg/MetronomeDxe/MetronomeDxe.inf diff --git a/Platforms/Hisilicon/D05/D05.dsc b/Platforms/Hisilicon/D05/D05.dsc index c1f4dfdda4f1..a22af3abaf2f 100644 --- a/Platforms/Hisilicon/D05/D05.dsc +++ b/Platforms/Hisilicon/D05/D05.dsc @@ -494,7 +494,7 @@ MdeModulePkg/Universal/FaultTolerantWriteDxe/FaultTolerantWriteDxe.inf MdeModulePkg/Universal/MonotonicCounterRuntimeDxe/MonotonicCounterRuntimeDxe.inf - EmbeddedPkg/ResetRuntimeDxe/ResetRuntimeDxe.inf + MdeModulePkg/Universal/ResetSystemRuntimeDxe/ResetSystemRuntimeDxe.inf EmbeddedPkg/RealTimeClockRuntimeDxe/RealTimeClockRuntimeDxe.inf { CpldIoLib|OpenPlatformPkg/Chips/Hisilicon/Library/CpldIoLib/CpldIoLibRuntime.inf diff --git a/Platforms/Hisilicon/D05/D05.fdf b/Platforms/Hisilicon/D05/D05.fdf index 5a646f3825be..0b2eff0b9c26 100644 --- a/Platforms/Hisilicon/D05/D05.fdf +++ b/Platforms/Hisilicon/D05/D05.fdf @@ -173,7 +173,7 @@ READ_LOCK_STATUS = TRUE INF MdeModulePkg/Universal/CapsuleRuntimeDxe/CapsuleRuntimeDxe.inf INF MdeModulePkg/Universal/MonotonicCounterRuntimeDxe/MonotonicCounterRuntimeDxe.inf - INF EmbeddedPkg/ResetRuntimeDxe/ResetRuntimeDxe.inf + INF MdeModulePkg/Universal/ResetSystemRuntimeDxe/ResetSystemRuntimeDxe.inf INF EmbeddedPkg/RealTimeClockRuntimeDxe/RealTimeClockRuntimeDxe.inf INF EmbeddedPkg/MetronomeDxe/MetronomeDxe.inf