diff options
| author | Tom Rini <trini@konsulko.com> | 2021-01-15 07:23:50 -0500 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2021-01-15 07:55:11 -0500 |
| commit | 83e13c3469c710af03bf43f53aede0f9b7ba2dd0 (patch) | |
| tree | 411d6bc9f7f2dbe605fcc979f680b286fabba695 /arch/arm/mach-socfpga/mailbox_s10.c | |
| parent | 35772ff4f63a302e0b873096372c70292fb0af79 (diff) | |
| parent | 40551cf99c237f93d9e0e07b6dd8f31b3868a0f0 (diff) | |
Merge branch '2021.04-rc' of https://github.com/lftan/u-boot
- Add ATF flow for SoC64 devices
- Update socfpgaimage to support print header and update padding flow
Diffstat (limited to 'arch/arm/mach-socfpga/mailbox_s10.c')
| -rw-r--r-- | arch/arm/mach-socfpga/mailbox_s10.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/arch/arm/mach-socfpga/mailbox_s10.c b/arch/arm/mach-socfpga/mailbox_s10.c index 18d44924e62..429444f0694 100644 --- a/arch/arm/mach-socfpga/mailbox_s10.c +++ b/arch/arm/mach-socfpga/mailbox_s10.c @@ -11,6 +11,7 @@ #include <asm/arch/mailbox_s10.h> #include <asm/arch/system_manager.h> #include <asm/secure.h> +#include <asm/system.h> DECLARE_GLOBAL_DATA_PTR; @@ -398,6 +399,9 @@ error: int mbox_reset_cold(void) { +#if !defined(CONFIG_SPL_BUILD) && defined(CONFIG_SPL_ATF) + psci_system_reset(); +#else int ret; ret = mbox_send_cmd(MBOX_ID_UBOOT, MBOX_REBOOT_HPS, MBOX_CMD_DIRECT, @@ -406,6 +410,7 @@ int mbox_reset_cold(void) /* mailbox sent failure, wait for watchdog to kick in */ hang(); } +#endif return 0; } |