diff options
| author | Tom Rini <trini@ti.com> | 2014-12-30 16:42:23 -0500 |
|---|---|---|
| committer | Tom Rini <trini@ti.com> | 2014-12-30 16:42:23 -0500 |
| commit | 6d76e2aca82a0da47df80304211203f80b09f082 (patch) | |
| tree | a70a7a02f5e702b9bd633292d685a22a62fdb4b9 | |
| parent | 5523cc2b8aa01c81c1df476e4e466d418510eae3 (diff) | |
| parent | d0e932de7c8e46ade1994e03e864636db3922520 (diff) | |
| download | u-boot-imx-6d76e2aca82a0da47df80304211203f80b09f082.zip u-boot-imx-6d76e2aca82a0da47df80304211203f80b09f082.tar.gz u-boot-imx-6d76e2aca82a0da47df80304211203f80b09f082.tar.bz2 | |
Merge branch 'master' of git://git.denx.de/u-boot-socfpga
| -rw-r--r-- | arch/arm/cpu/armv7/socfpga/misc.c | 12 | ||||
| -rw-r--r-- | include/configs/socfpga_common.h | 2 |
2 files changed, 12 insertions, 2 deletions
diff --git a/arch/arm/cpu/armv7/socfpga/misc.c b/arch/arm/cpu/armv7/socfpga/misc.c index 73cffd3..7873c38 100644 --- a/arch/arm/cpu/armv7/socfpga/misc.c +++ b/arch/arm/cpu/armv7/socfpga/misc.c @@ -9,6 +9,7 @@ #include <altera.h> #include <miiphy.h> #include <netdev.h> +#include <watchdog.h> #include <asm/arch/reset_manager.h> #include <asm/arch/system_manager.h> #include <asm/arch/dwmmc.h> @@ -150,14 +151,23 @@ static inline void socfpga_fpga_add(void) {} int arch_cpu_init(void) { +#ifdef CONFIG_HW_WATCHDOG + /* + * In case the watchdog is enabled, make sure to (re-)configure it + * so that the defined timeout is valid. Otherwise the SPL (Perloader) + * timeout value is still active which might too short for Linux + * booting. + */ + hw_watchdog_init(); +#else /* * If the HW watchdog is NOT enabled, make sure it is not running, * for example because it was enabled in the preloader. This might * trigger a watchdog-triggered reboot of Linux kernel later. */ -#ifndef CONFIG_HW_WATCHDOG socfpga_watchdog_reset(); #endif + return 0; } diff --git a/include/configs/socfpga_common.h b/include/configs/socfpga_common.h index 6bb9473..6b1f967 100644 --- a/include/configs/socfpga_common.h +++ b/include/configs/socfpga_common.h @@ -139,7 +139,7 @@ #define CONFIG_DESIGNWARE_WATCHDOG #define CONFIG_DW_WDT_BASE SOCFPGA_L4WD0_ADDRESS #define CONFIG_DW_WDT_CLOCK_KHZ 25000 -#define CONFIG_HW_WATCHDOG_TIMEOUT_MS 12000 +#define CONFIG_HW_WATCHDOG_TIMEOUT_MS 30000 #endif /* |