The current current watchdog timeout of 12 seconds is a bit small for
booting into Linux, especially when using a NFS based rootfs. So lets
change this timeout to a more defensive value of 30 seconds.
Also we now call the hw_watchdog_init() function so that we override
the value already configured from the Preloader.
Signed-off-by: Stefan Roese s...@denx.de
Cc: Vince Bridgers vbrid...@opensource.altera.com
Cc: Dinh Nguyen dingu...@opensource.altera.com
Cc: Chin Liang See cl...@altera.com
Cc: Marek Vasut ma...@denx.de
Cc: Pavel Machek pa...@denx.de
---
v2:
- Invert logic so that we can use #ifdef instead of #ifndef
as suggested by Marek (thanks)
arch/arm/cpu/armv7/socfpga/misc.c | 12 +++-
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_KHZ25000
-#define CONFIG_HW_WATCHDOG_TIMEOUT_MS 12000
+#define CONFIG_HW_WATCHDOG_TIMEOUT_MS 3
#endif
/*
--
2.2.1
___
U-Boot mailing list
U-Boot@lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot
