diff options
author | Tom Rini <trini@konsulko.com> | 2019-05-16 07:09:33 -0400 |
---|---|---|
committer | Tom Rini <trini@konsulko.com> | 2019-05-16 07:09:33 -0400 |
commit | b51d103cab173f4480d66b6b93c62d36e2f5fded (patch) | |
tree | 87fd886fff542ee1b62cf1a8f89e7f1623a81c22 /arch/arm/mach-socfpga/include/mach/reset_manager_s10.h | |
parent | 9a32caf52d0dd8287d071eb6a0d93cacfea3fd17 (diff) | |
parent | 9e6ed1a3466ea35d98e074187abcbcfee550b448 (diff) |
Merge branch 'master' of git://git.denx.de/u-boot-socfpga
- SoCFPGA DT and reset cleanup, AE MCVEVK board support.
Diffstat (limited to 'arch/arm/mach-socfpga/include/mach/reset_manager_s10.h')
-rw-r--r-- | arch/arm/mach-socfpga/include/mach/reset_manager_s10.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/arm/mach-socfpga/include/mach/reset_manager_s10.h b/arch/arm/mach-socfpga/include/mach/reset_manager_s10.h index b93bbaf537..452147b017 100644 --- a/arch/arm/mach-socfpga/include/mach/reset_manager_s10.h +++ b/arch/arm/mach-socfpga/include/mach/reset_manager_s10.h @@ -8,7 +8,6 @@ #define _RESET_MANAGER_S10_ void reset_cpu(ulong addr); -void reset_deassert_peripherals_handoff(void); int cpu_has_been_warmreset(void); void socfpga_bridges_reset(int enable); |