[U-Boot] [PATCH 2/2] armv8: fsl-layerscape: do not use layerscape EFI reset if PSCI used

[Priyanka Jain]

>-----Original Message-----
>From: Mathew McBride <matt at traverse.com.au>
>Sent: Friday, October 18, 2019 8:58 AM
>To: u-boot at lists.denx.de
>Cc: Priyanka Jain <priyanka.jain at nxp.com>; Mathew McBride
><matt at traverse.com.au>
>Subject: [PATCH 2/2] armv8: fsl-layerscape: do not use layerscape EFI reset if
>PSCI used
>
>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 at traverse.com.au>
>Cc: Priyanka Jain <priyanka.jain at 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

Trimmed subject .Applied to fsl-qoriq master, awaiting upstream.

Thanks
priyankajain