mirrors/u-boot
0
0
Fork 0
mirror of https://github.com/u-boot/u-boot.git synced 2024-12-14 23:33:26 +08:00
Code Issues Packages Projects Releases Wiki Activity

arm64: layerscape: Support SYSRESET

Browse Source 
CONFIG_SYSRESET provides its own implementation of reset_cpu. Disable
our version when it is enabled.

Signed-off-by: Sean Anderson <sean.anderson@seco.com>
Signed-off-by: Peng Fan <peng.fan@nxp.com>
This commit is contained in:
Sean Anderson 2022-09-26 12:47:37 -04:00 committed by Peng Fan
parent e6b719af9a
commit 8fd111351c
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
arch/arm/cpu/armv8/fsl-layerscape/cpu.c
View File

@ -1229,6 +1229,7 @@ int timer_init(void)
return 0; return 0;
} }
#if !CONFIG_IS_ENABLED(SYSRESET)
__efi_runtime_data u32 __iomem *rstcr = (u32 *)CONFIG_SYS_FSL_RST_ADDR; __efi_runtime_data u32 __iomem *rstcr = (u32 *)CONFIG_SYS_FSL_RST_ADDR;
void __efi_runtime reset_cpu(void) void __efi_runtime reset_cpu(void)
@ -1248,6 +1249,7 @@ void __efi_runtime reset_cpu(void)
scfg_out32(rstcr, val); scfg_out32(rstcr, val);
#endif #endif
} }
#endif
#if defined(CONFIG_EFI_LOADER) && !defined(CONFIG_PSCI_RESET) #if defined(CONFIG_EFI_LOADER) && !defined(CONFIG_PSCI_RESET)