projects
/
platform
/
kernel
/
u-boot.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
b50fe3f
)
fsl-layerscape: do not use layerscape EFI reset if PSCI used
author
Mathew McBride
<matt@traverse.com.au>
Fri, 18 Oct 2019 03:27:54 +0000
(14:27 +1100)
committer
Priyanka Jain
<priyanka.jain@nxp.com>
Fri, 8 Nov 2019 05:43:38 +0000
(11:13 +0530)
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>
arch/arm/cpu/armv8/fsl-layerscape/cpu.c
patch
|
blob
|
history
diff --git
a/arch/arm/cpu/armv8/fsl-layerscape/cpu.c
b/arch/arm/cpu/armv8/fsl-layerscape/cpu.c
index
8fd6c75
..
1f4c0b2
100644
(file)
--- 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
}
#endif
}
-#if
def 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,
void __efi_runtime EFIAPI efi_reset_system(
enum efi_reset_type reset_type,