From: Mathew McBride <matt@traverse.com.au>
Date: Fri, 18 Oct 2019 03:27:54 +0000 (+1100)
Subject: fsl-layerscape: do not use layerscape EFI reset if PSCI used
X-Git-Tag: v2020.10~507^2~14
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=28f9393b1aadf61f689e80dadc74b77bf67e7fd6;p=platform%2Fkernel%2Fu-boot.git

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@traverse.com.au>
Signed-off-by: Priyanka Jain <priyanka.jain@nxp.com>
---

diff --git a/arch/arm/cpu/armv8/fsl-layerscape/cpu.c b/arch/arm/cpu/armv8/fsl-layerscape/cpu.c
index 8fd6c75..1f4c0b2 100644
--- a/arch/arm/cpu/armv8/fsl-layerscape/cpu.c
+++ b/arch/arm/cpu/armv8/fsl-layerscape/cpu.c
@@ -1221,7 +1221,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,