From patchwork Mon Jul 3 15:17:57 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ard Biesheuvel X-Patchwork-Id: 106911 Delivered-To: patch@linaro.org Received: by 10.182.135.102 with SMTP id pr6csp11688obb; Mon, 3 Jul 2017 08:19:21 -0700 (PDT) X-Received: by 10.107.6.203 with SMTP id f72mr34971698ioi.144.1499095161219; Mon, 03 Jul 2017 08:19:21 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1499095161; cv=none; d=google.com; s=arc-20160816; b=URdnT7ZpPDULRz1oiKes1DxY8a9P2ZYeIVcQV1tBsbCMRBatBcaFxDDWp/KSXJkJtF OEpLjLVHj6L508drAtkqeOLN116Fz9+eoXaZKCPZ0IOrFQ+k59BZYcOYUHJV10zSaiD3 3lA4GYGRJHfoV0BLfrIqwbc9/YqFiNtq6UfIElrwiMbyMc+k3L7EkFr+SFyoGANLDkBY 4b5GPmtD0AZHf8MZzhdVdrhGkoaw2WorK0Q2FRxCxecbupab9Qi+2x1KNu68gbVpxM5+ GPaljf7UF4SgXuqp0ThRWMC02QxfP4qzKF+xuXsUwjuknKtqS7B92bfiKpHjPdt5JYrD Typw== 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=Abl+7yd8EWFsNTkTuwHj2ZDvdHw3u4vTAdkGdBmdVpI=; b=BOfLVGKJSDPqWHHFwuc4aohueRr6FOoTHdp3AYTH6Q5Ff14UQWI4hxyO3+VAgMMITh qZq0Mh0/UHdF/jTbjDijDGGWVHXrUT06Qiz7hIOPHGUNuBl209AOqZfqiecB9JgQQl9D qZRNqTGs1zdAg1qJTmeWOFd3nC+1GEwpVHQnssXt7G4Rvm8J2oMryc+yvMPRSV5OK783 8lNiiwT4s0hhixijHOy5Lv9lHM4ucKL1g3R7hW6mCxPQjM30zVZPQ2k8/yYd++9yHXJD qtD8JaRv2YDN2n4bJIstmLHi2SstQXgp9NAhxejyxfTCNeEN6juo+7TKLr7xSONUH4jF Pcmw== 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 197si11816886iti.120.2017.07.03.08.19.20; Mon, 03 Jul 2017 08:19:21 -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 B337660B0F; Mon, 3 Jul 2017 15:19: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, 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 59F5960AF7; Mon, 3 Jul 2017 15:18:32 +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 E744660AF7; Mon, 3 Jul 2017 15:18:24 +0000 (UTC) Received: from mail-wm0-f44.google.com (mail-wm0-f44.google.com [74.125.82.44]) by lists.linaro.org (Postfix) with ESMTPS id 938D060967 for ; Mon, 3 Jul 2017 15:18:10 +0000 (UTC) Received: by mail-wm0-f44.google.com with SMTP id i127so112119900wma.0 for ; Mon, 03 Jul 2017 08:18:10 -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=ZnuXAMA6jF97SAbXrXRhARD5qvCJ4bZixGJ7sW6eQMw=; b=qKXE6a+uezj65sLAKP8EJZvSxrzuW/jpKAHRlnHWl0/UR1oJMmhVHRqJMKF2adpQOK OG7rt3LeKTvaSCu2hJW60GXnRj11igW44L5myxzvYxfbV/G7SZgJP2Abqw6m5N4jkWgF rnBtPxIHzC4I9Z4Sd/gtHu00Sm/TJpWXCIuJFztFenJUY7WB/RYFofsQDZD1dShcVajV cY95E1qGsiWGWEJvl4A84ZoZigmiHfYg2f9gqRcf0bhN4BNK/DhA81QFWfjgiJR7lCiT Scr+3/cn34nO3f8946BMgC1Ocd1r2kyZhG41TskN+IauFITsM+FDU45vQ+gMDv7hsYs7 lwsw== X-Gm-Message-State: AKS2vOx2DNExdPEXctvbutknxiDv+JKExbR2PS4u0v5kn/ROHnODQ6Hn jV43B/zIHlVU4sIYTU1YEh04 X-Received: by 10.28.229.209 with SMTP id c200mr20712977wmh.43.1499095089442; Mon, 03 Jul 2017 08:18:09 -0700 (PDT) Received: from localhost.localdomain ([154.151.196.199]) by smtp.gmail.com with ESMTPSA id o4sm17809309wrb.27.2017.07.03.08.18.07 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 03 Jul 2017 08:18:08 -0700 (PDT) From: Ard Biesheuvel To: linaro-uefi@lists.linaro.org, leif.lindholm@linaro.org Date: Mon, 3 Jul 2017 16:17:57 +0100 Message-Id: <20170703151757.8413-4-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 3/3] Platforms/HiKey: 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 --- Platforms/Hisilicon/HiKey/HiKey.dsc | 4 ++-- Platforms/Hisilicon/HiKey/HiKey.fdf | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Platforms/Hisilicon/HiKey/HiKey.dsc b/Platforms/Hisilicon/HiKey/HiKey.dsc index 773c5809aa5d..b6f6a686c3ff 100644 --- a/Platforms/Hisilicon/HiKey/HiKey.dsc +++ b/Platforms/Hisilicon/HiKey/HiKey.dsc @@ -56,7 +56,7 @@ DebugAgentLib|MdeModulePkg/Library/DebugAgentLibNull/DebugAgentLibNull.inf DevicePathLib|MdePkg/Library/UefiDevicePathLib/UefiDevicePathLib.inf DxeServicesTableLib|MdePkg/Library/DxeServicesTableLib/DxeServicesTableLib.inf - EfiResetSystemLib|ArmPkg/Library/ArmPsciResetSystemLib/ArmPsciResetSystemLib.inf + ResetSystemLib|ArmPkg/Library/ArmSmcPsciResetSystemLib/ArmSmcPsciResetSystemLib.inf MemoryAllocationLib|MdePkg/Library/UefiMemoryAllocationLib/UefiMemoryAllocationLib.inf SynchronizationLib|MdePkg/Library/BaseSynchronizationLib/BaseSynchronizationLib.inf @@ -366,7 +366,7 @@ MdeModulePkg/Universal/SecurityStubDxe/SecurityStubDxe.inf MdeModulePkg/Universal/CapsuleRuntimeDxe/CapsuleRuntimeDxe.inf EmbeddedPkg/EmbeddedMonotonicCounter/EmbeddedMonotonicCounter.inf - EmbeddedPkg/ResetRuntimeDxe/ResetRuntimeDxe.inf + MdeModulePkg/Universal/ResetSystemRuntimeDxe/ResetSystemRuntimeDxe.inf EmbeddedPkg/RealTimeClockRuntimeDxe/RealTimeClockRuntimeDxe.inf EmbeddedPkg/MetronomeDxe/MetronomeDxe.inf diff --git a/Platforms/Hisilicon/HiKey/HiKey.fdf b/Platforms/Hisilicon/HiKey/HiKey.fdf index 9c8c54a3f9fc..3f01299f7708 100644 --- a/Platforms/Hisilicon/HiKey/HiKey.fdf +++ b/Platforms/Hisilicon/HiKey/HiKey.fdf @@ -96,7 +96,7 @@ READ_LOCK_STATUS = TRUE INF MdeModulePkg/Universal/SecurityStubDxe/SecurityStubDxe.inf 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