diff options
| author | Ji Luo <ji.luo@nxp.com> | 2019-11-05 14:02:17 +0800 |
|---|---|---|
| committer | Ji Luo <ji.luo@nxp.com> | 2019-11-05 14:23:56 +0800 |
| commit | 85f6a6c92594f0ebd6d2fd8aae8515ade9d4da2d (patch) | |
| tree | 9fd37a2ffee2e16e3f4f6f218a4a2caea92e570d /arch | |
| parent | 07304c60ea2ba62af00775296793d9744a7bad2f (diff) | |
MA-15813-2 [Android] imx8q: Enable reset in spl stage
The psci driver is not available at spl stage, calling
reset_misc() will lead to panic. Guard the reset_misc()
with "CONFIG_SPL_BUILD" config, leave the reset_cpu() to
trigger board reset.
Test: reset om imx8qm_mek.
Change-Id: Icf95eb4505ba444f9930aa0320d34456fa22733f
Signed-off-by: Ji Luo <ji.luo@nxp.com>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/cpu/armv8/fwcall.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/cpu/armv8/fwcall.c b/arch/arm/cpu/armv8/fwcall.c index c220267536..6ae1ea7810 100644 --- a/arch/arm/cpu/armv8/fwcall.c +++ b/arch/arm/cpu/armv8/fwcall.c @@ -131,7 +131,7 @@ int do_poweroff(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) } #endif -#ifdef CONFIG_PSCI_RESET +#if defined(CONFIG_PSCI_RESET) && !defined(CONFIG_SPL_BUILD) void reset_misc(void) { psci_system_reset(); @@ -156,4 +156,4 @@ void __efi_runtime EFIAPI efi_reset_system( while (1) { } } #endif /* CONFIG_EFI_LOADER */ -#endif /* CONFIG_PSCI_RESET */ +#endif /* CONFIG_PSCI_RESET && !CONFIG_SPL_BUILD */ |