From patchwork Fri Oct 18 03:27:54 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mathew McBride X-Patchwork-Id: 1179103 X-Patchwork-Delegate: priyanka.jain@nxp.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (no SPF record) smtp.mailfrom=lists.denx.de (client-ip=81.169.180.215; helo=lists.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=traverse.com.au Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 46vX7j53b9z9sPZ for ; Fri, 18 Oct 2019 14:48:33 +1100 (AEDT) Received: by lists.denx.de (Postfix, from userid 105) id 5216DC21DF3; Fri, 18 Oct 2019 03:48:13 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on lists.denx.de X-Spam-Level: X-Spam-Status: No, score=0.0 required=5.0 tests=none autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.denx.de (localhost [IPv6:::1]) by lists.denx.de (Postfix) with ESMTP id 98C5AC21D8E; Fri, 18 Oct 2019 03:47:53 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 46E55C21C27; Fri, 18 Oct 2019 03:28:06 +0000 (UTC) Received: from ipmail07.adl2.internode.on.net (ipmail07.adl2.internode.on.net [150.101.137.131]) by lists.denx.de (Postfix) with ESMTP id 5ED40C21BE5 for ; Fri, 18 Oct 2019 03:28:05 +0000 (UTC) X-IronPort-Anti-Spam-Filtered: true X-IronPort-Anti-Spam-Result: A2B/BQDh299Z/42cEXdeGwEBBAEBCgEBgmtzgVInjw2PAQEBBoFaAZYNggSFPwQCAoQ+WAECAQEBAQECayiFHgYyASMjEFE5HhmKEQyuGoQRhysBAQEHKIMtgxCCMod4IGOFKAWhRHOTapMdlyRXgQ50GYVjHIF7LDaJE4JEAQEB Received: from 119-17-156-141.nbn.mel.aussiebb.net (HELO localhost.localdomain) ([119.17.156.141]) by ipmail07.adl2.internode.on.net with ESMTP; 18 Oct 2019 13:58:04 +1030 From: Mathew McBride To: u-boot@lists.denx.de Date: Fri, 18 Oct 2019 14:27:54 +1100 Message-Id: <20191018032754.65041-3-matt@traverse.com.au> X-Mailer: git-send-email 2.19.1 In-Reply-To: <20191018032754.65041-1-matt@traverse.com.au> References: <20191018032754.65041-1-matt@traverse.com.au> MIME-Version: 1.0 X-Mailman-Approved-At: Fri, 18 Oct 2019 03:47:50 +0000 Subject: [U-Boot] [PATCH 2/2] armv8: fsl-layerscape: do not use layerscape EFI reset if PSCI used X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.18 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" If the secure world reset handlers are used (via CONFIG_PSCI_RESET), then do not use the layerscape-specific implementation. Signed-off-by: Mathew McBride Cc: Priyanka Jain --- arch/arm/cpu/armv8/fsl-layerscape/cpu.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/arm/cpu/armv8/fsl-layerscape/cpu.c b/arch/arm/cpu/armv8/fsl-layerscape/cpu.c index a5d0b5370f..b4012793fd 100644 --- a/arch/arm/cpu/armv8/fsl-layerscape/cpu.c +++ b/arch/arm/cpu/armv8/fsl-layerscape/cpu.c @@ -1218,7 +1218,7 @@ void __efi_runtime reset_cpu(ulong addr) #endif } -#ifdef CONFIG_EFI_LOADER +#if defined(CONFIG_EFI_LOADER) && !defined(CONFIG_PSCI_RESET) void __efi_runtime EFIAPI efi_reset_system( enum efi_reset_type reset_type,