diff options
author | Tom Rini <trini@konsulko.com> | 2020-10-12 07:55:17 -0400 |
---|---|---|
committer | Tom Rini <trini@konsulko.com> | 2020-10-12 07:55:17 -0400 |
commit | 9885313b9add6c04cf3059958c5ee51a4f0ac930 (patch) | |
tree | 521f4068c38677a996fe4d9b61d842426af6cfb4 /arch/arm/mach-socfpga/spl_s10.c | |
parent | 47e9c70421d75336336097c1425028b40e4f0b54 (diff) | |
parent | 505dc1c6795ba0b80abf344bb6464cdc20774f44 (diff) |
Merge branch 'for-next' of https://github.com/lftan/u-boot
Diffstat (limited to 'arch/arm/mach-socfpga/spl_s10.c')
-rw-r--r-- | arch/arm/mach-socfpga/spl_s10.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/arm/mach-socfpga/spl_s10.c b/arch/arm/mach-socfpga/spl_s10.c index b3c6f6afc44..daed05653ad 100644 --- a/arch/arm/mach-socfpga/spl_s10.c +++ b/arch/arm/mach-socfpga/spl_s10.c @@ -53,11 +53,11 @@ void board_init_f(ulong dummy) socfpga_get_managers_addr(); -#ifdef CONFIG_HW_WATCHDOG /* Ensure watchdog is paused when debugging is happening */ writel(SYSMGR_WDDBG_PAUSE_ALL_CPU, socfpga_get_sysmgr_addr() + SYSMGR_SOC64_WDDBG); +#ifdef CONFIG_HW_WATCHDOG /* Enable watchdog before initializing the HW */ socfpga_per_reset(SOCFPGA_RESET(L4WD0), 1); socfpga_per_reset(SOCFPGA_RESET(L4WD0), 0); @@ -81,6 +81,7 @@ void board_init_f(ulong dummy) #endif preloader_console_init(); + print_reset_info(); cm_print_clock_quick_summary(); firewall_setup(); |