From: Mathew McBride <matt@traverse.com.au>
To: u-boot@lists.denx.de
Subject: [U-Boot] [PATCH 2/2] armv8: fsl-layerscape: do not use layerscape EFI reset if PSCI used
Date: Fri, 18 Oct 2019 14:27:54 +1100 [thread overview]
Message-ID: <20191018032754.65041-3-matt@traverse.com.au> (raw)
In-Reply-To: <20191018032754.65041-1-matt@traverse.com.au>
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 <matt@traverse.com.au>
Cc: Priyanka Jain <priyanka.jain@nxp.com>
---
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,
--
2.19.1
next prev parent reply other threads:[~2019-10-18 3:27 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-10-18 3:27 [U-Boot] [PATCH 0/2] armv8: fsl-layerscape: Allow use of PSCI handlers for ls1088a Mathew McBride
2019-10-18 3:27 ` [U-Boot] [PATCH 1/2] armv8: dts: ls1088a: add PSCI binding for LS1088A Mathew McBride
2019-10-18 7:24 ` Priyanka Jain
2019-10-18 20:45 ` Mathew McBride
2019-10-21 5:50 ` Priyanka Jain
2019-11-11 8:53 ` Priyanka Jain
2019-10-18 3:27 ` Mathew McBride [this message]
2019-11-11 8:54 ` [U-Boot] [PATCH 2/2] armv8: fsl-layerscape: do not use layerscape EFI reset if PSCI used Priyanka Jain
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20191018032754.65041-3-matt@traverse.com.au \
--to=matt@traverse.com.au \
--cc=u-boot@lists.denx.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.