From patchwork Tue Jul 4 17:26:12 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Leif Lindholm X-Patchwork-Id: 107002 Delivered-To: patch@linaro.org Received: by 10.140.101.44 with SMTP id t41csp1245307qge; Tue, 4 Jul 2017 10:28:22 -0700 (PDT) X-Received: by 10.200.57.225 with SMTP id v88mr49505939qte.50.1499189302355; Tue, 04 Jul 2017 10:28:22 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1499189302; cv=none; d=google.com; s=arc-20160816; b=PhDrzmtCn/KuzjYwlZ+s9shXwVSOOL5WCRRQLrbOvvXDvTmJslYL3fuswTPrjrGrXA zHVZ5wiJnI+9NwFG5FD0GehGbFt/vEFxZBLJeX6Tb/OlgaQGw1b/ccnSIv7XEe1jCTH1 Lwut5rrRwq9c9lzUMl8uN3/xJalyKBqdeESm18mEpvC19MWnkhSxtjAB9xp6L4h8u06Y Pyq2Q4h2XXgr+0alDtlHSRINV1grxgO8OIrVf7v79KySBsm6y/5X2L203a7RbbiUnvrH ApGsdgLt/PHQ7GeKWNNEysKDs/8tJS5akzqnXhmp0Wl4wzGW56CT1bUFQLp7aVXDyaHp xXBQ== 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:message-id:date:to:from:delivered-to :arc-authentication-results; bh=W/Mw1WvxQIiixszA8QIKLUGvc8qKntuNu3GWhmDNMqs=; b=bzC+M4S2rj4iFTf/TnWnkVqIL+5LFPocht8aZrA48Lw8A1VRUHvSf6dyZDdvx0ZngM 8jJj2w+rv0FQMq5XOY5CgMhSvOswfmSCKRCmPrpv6Osqof75TCfKRtM7Qn4L2mOR5ipq S8eUq/KpY12Av7jlUo0YRjh1mITwwEIqTW4/jbdmDe1qjoqKxyarxP3SlqIAs15geyvY d01cqJ1AbufPnhU99v2cL0DDrxVuW11jxE+Wulw9gPlmCbwAbn8kK0zXFBSuKzAsb3C3 +9+z2PELtas6ePS3/W3vM7fkfsRpXwfwbSzmotczetUqgRXiSPh84DllmEwUKSWGrNAU HP+g== 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 c33si18308586qte.236.2017.07.04.10.28.21; Tue, 04 Jul 2017 10:28:22 -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 6702660921; Tue, 4 Jul 2017 17:28:21 +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 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 8512B608C0; Tue, 4 Jul 2017 17:28:17 +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 0549E6088A; Tue, 4 Jul 2017 17:28:15 +0000 (UTC) Received: from mail-wm0-f42.google.com (mail-wm0-f42.google.com [74.125.82.42]) by lists.linaro.org (Postfix) with ESMTPS id 0143F6088A for ; Tue, 4 Jul 2017 17:28:15 +0000 (UTC) Received: by mail-wm0-f42.google.com with SMTP id i127so144692818wma.0 for ; Tue, 04 Jul 2017 10:28:14 -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; bh=rzM5bOKyBh5L+f8HlxtPpa0CG7POpyt9Pmp6z2dRAEg=; b=CDh0/ZGrO7n3RBetUNnJc4ilgNOuV+uDaDKjlSREjpjcZ4D65bly3Egjc12lFNicGC 7kjt171gICbVs/6wDjEeSlhEbplIo2mbm/2YGuRGF4cRgB/eLAuypCTPuUAIWNTrAzXN FFGARpHknAltkuvmzSxGjq0+j7IG1ciNkq/momUJK75UhEU9s3DA/qzusglp0T05t+L2 TCO2fOWiP73Mj3URxdyjEZ4/rsAOvGvMkU68CzdN3vfsNWKUVUglDt2GKgByk3s2fq/h bzMtn/DkJwlZoMFz5e1jr5ht5iQo5qfSWePw4nIDI03fz1bcJ6iA3Ko1jVn9kpbxfDVq 6XJw== X-Gm-Message-State: AKS2vOzsAtMw0Jz3tBvIg6avC7XWdUBmzmANuoODvPc/y967pEW3tmsc Khs3bTMM20/Ynf4jtRGgbRE8 X-Received: by 10.28.51.212 with SMTP id z203mr30712768wmz.103.1499189293805; Tue, 04 Jul 2017 10:28:13 -0700 (PDT) Received: from mohikan.hemma.eciton.net (cpc92316-cmbg19-2-0-cust118.5-4.cable.virginm.net. [82.12.0.119]) by smtp.gmail.com with ESMTPSA id l190sm11183749wmb.18.2017.07.04.10.28.13 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 04 Jul 2017 10:28:13 -0700 (PDT) From: Leif Lindholm To: linaro-uefi@lists.linaro.org Date: Tue, 4 Jul 2017 18:26:12 +0100 Message-Id: <20170704172612.27799-1-leif.lindholm@linaro.org> X-Mailer: git-send-email 2.11.0 Subject: [Linaro-uefi] [PATCH] Platforms/ARM: move ARM platforms 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" Update (32-bit) ARM platforms to use generic ResetSystemRuntimeDxe, and update the library mapping to provide a ResetSystemLib (via the new version of ArmVeResetSystemLib). Update TC2 to explicitly include MdeModulePkg ResetSystemRuntimeDxe. Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: Leif Lindholm Reviewed-by: Ard Biesheuvel Tested-by: Ryan Harkin --- This change depends on the updated version of ArmVeResetSystemLib, not yet merged in edk2. Platforms/ARM/VExpress/ArmVExpress-CTA15-A7.dsc | 2 +- Platforms/ARM/VExpress/ArmVExpress-CTA15-A7.fdf | 2 +- Platforms/ARM/VExpress/ArmVExpress.dsc.inc | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Platforms/ARM/VExpress/ArmVExpress-CTA15-A7.dsc b/Platforms/ARM/VExpress/ArmVExpress-CTA15-A7.dsc index d1cfc71983..2fa484050b 100644 --- a/Platforms/ARM/VExpress/ArmVExpress-CTA15-A7.dsc +++ b/Platforms/ARM/VExpress/ArmVExpress-CTA15-A7.dsc @@ -222,7 +222,7 @@ } MdeModulePkg/Universal/FaultTolerantWriteDxe/FaultTolerantWriteDxe.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/ARM/VExpress/ArmVExpress-CTA15-A7.fdf b/Platforms/ARM/VExpress/ArmVExpress-CTA15-A7.fdf index 1903389c8e..cb9a89ef0c 100644 --- a/Platforms/ARM/VExpress/ArmVExpress-CTA15-A7.fdf +++ b/Platforms/ARM/VExpress/ArmVExpress-CTA15-A7.fdf @@ -79,7 +79,7 @@ FvNameGuid = 73dcb643-3862-4904-9076-a94af1890243 INF MdeModulePkg/Universal/Variable/RuntimeDxe/VariableRuntimeDxe.inf INF MdeModulePkg/Universal/FaultTolerantWriteDxe/FaultTolerantWriteDxe.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/ARM/VExpress/ArmVExpress.dsc.inc b/Platforms/ARM/VExpress/ArmVExpress.dsc.inc index 3f6e50573c..f2a05e8e6b 100644 --- a/Platforms/ARM/VExpress/ArmVExpress.dsc.inc +++ b/Platforms/ARM/VExpress/ArmVExpress.dsc.inc @@ -254,7 +254,7 @@ # syscfg MMIO register implementation on ARM. # This will not work at actual runtime. # - EfiResetSystemLib|ArmPlatformPkg/ArmVExpressPkg/Library/ResetSystemLib/ResetSystemLib.inf + ResetSystemLib|ArmPlatformPkg/ArmVExpressPkg/Library/ResetSystemLib/ResetSystemLib.inf [LibraryClasses.ARM, LibraryClasses.AARCH64] #