[U-Boot] [PATCH v1] watchdog: move WATCHDOG_TIMEOUT_MSECS to Kconfig

Stefan Roese sr at denx.de
Mon Aug 26 09:37:15 UTC 2019


Hi Heiko,

On 12.06.19 10:22, Heiko Schocher wrote:
> move WATCHDOG_TIMEOUT_MSECS to Kconfig and fix
> all board defconfigs.
> 
> Signed-off-by: Heiko Schocher <hs at denx.de>
> ---
> 
> Patchseries build fine on travis see:
> https://travis-ci.org/hsdenx/u-boot-test/builds/544546490
> 
> Based on mainline commit:
> 68b90e57bc: "configs: tinker-rk3288 disable CONFIG_SPL_I2C_SUPPORT"
> 
> and wdt imx patches from Marek:
> http://patchwork.ozlabs.org/patch/1112591/
> http://patchwork.ozlabs.org/patch/1112592/
> 
>   arch/arm/cpu/armv8/fsl-layerscape/doc/README.lsch2 | 1 -
>   configs/dh_imx6_defconfig                          | 1 +
>   configs/display5_defconfig                         | 1 +
>   configs/display5_factory_defconfig                 | 1 +
>   configs/ge_bx50v3_defconfig                        | 1 +
>   configs/kp_imx6q_tpc_defconfig                     | 1 +
>   configs/m53menlo_defconfig                         | 1 +
>   configs/mx53ppd_defconfig                          | 1 +
>   configs/tqma6s_wru4_mmc_defconfig                  | 1 +
>   configs/warp_defconfig                             | 1 +
>   drivers/watchdog/Kconfig                           | 9 +++++++++
>   include/configs/MPC8349ITX.h                       | 6 ------
>   include/configs/MPC837XERDB.h                      | 5 -----
>   include/configs/dh_imx6.h                          | 1 -
>   include/configs/display5.h                         | 1 -
>   include/configs/ge_bx50v3.h                        | 2 --
>   include/configs/kp_imx6q_tpc.h                     | 1 -
>   include/configs/m53menlo.h                         | 1 -
>   include/configs/mx53ppd.h                          | 2 --
>   include/configs/socfpga_common.h                   | 1 -
>   include/configs/socfpga_stratix10_socdk.h          | 1 -
>   include/configs/tqma6_wru4.h                       | 1 -
>   include/configs/warp.h                             | 1 -
>   include/wdt.h                                      | 3 ---
>   scripts/config_whitelist.txt                       | 1 -
>   25 files changed, 18 insertions(+), 28 deletions(-)

This patch does not apply any more. Could you please rebase and
send a new version?

Thanks,
Stefan
  
> diff --git a/arch/arm/cpu/armv8/fsl-layerscape/doc/README.lsch2 b/arch/arm/cpu/armv8/fsl-layerscape/doc/README.lsch2
> index 9583bf743e..d7f7b9f111 100644
> --- a/arch/arm/cpu/armv8/fsl-layerscape/doc/README.lsch2
> +++ b/arch/arm/cpu/armv8/fsl-layerscape/doc/README.lsch2
> @@ -16,6 +16,5 @@ You can enable it by setting CONFIG_IMX_WATCHDOG.
>   Use following config to set watchdog timeout, if this config is not defined,
>   the default timeout value is 128s which is the maximum. Set 10 seconds for
>   example:
> -    #define CONFIG_WATCHDOG_TIMEOUT_MSECS 10000
>   Set CONFIG_WATCHDOG_RESET_DISABLE to disable reset watchdog, so that the
>   watchdog will not be fed in u-boot.
> diff --git a/configs/dh_imx6_defconfig b/configs/dh_imx6_defconfig
> index d9ec5c7c5e..c3ef829553 100644
> --- a/configs/dh_imx6_defconfig
> +++ b/configs/dh_imx6_defconfig
> @@ -62,5 +62,6 @@ CONFIG_USB_GADGET_VENDOR_NUM=0x0525
>   CONFIG_USB_GADGET_PRODUCT_NUM=0xa4a5
>   CONFIG_CI_UDC=y
>   CONFIG_USB_GADGET_DOWNLOAD=y
> +CONFIG_WATCHDOG_TIMEOUT_MSECS=60000
>   CONFIG_IMX_WATCHDOG=y
>   CONFIG_OF_LIBFDT=y
> diff --git a/configs/display5_defconfig b/configs/display5_defconfig
> index 3b793f4500..1c52441802 100644
> --- a/configs/display5_defconfig
> +++ b/configs/display5_defconfig
> @@ -79,4 +79,5 @@ CONFIG_MII=y
>   CONFIG_MXC_UART=y
>   CONFIG_SPI=y
>   CONFIG_MXC_SPI=y
> +CONFIG_WATCHDOG_TIMEOUT_MSECS=15000
>   CONFIG_IMX_WATCHDOG=y
> diff --git a/configs/display5_factory_defconfig b/configs/display5_factory_defconfig
> index 0d9eed3a3e..1df7461a21 100644
> --- a/configs/display5_factory_defconfig
> +++ b/configs/display5_factory_defconfig
> @@ -86,5 +86,6 @@ CONFIG_USB_GADGET_VENDOR_NUM=0x1b67
>   CONFIG_USB_GADGET_PRODUCT_NUM=0x4000
>   CONFIG_CI_UDC=y
>   CONFIG_USB_GADGET_DOWNLOAD=y
> +CONFIG_WATCHDOG_TIMEOUT_MSECS=15000
>   CONFIG_IMX_WATCHDOG=y
>   CONFIG_OF_LIBFDT=y
> diff --git a/configs/ge_bx50v3_defconfig b/configs/ge_bx50v3_defconfig
> index 8be881b939..cc056dc681 100644
> --- a/configs/ge_bx50v3_defconfig
> +++ b/configs/ge_bx50v3_defconfig
> @@ -60,5 +60,6 @@ CONFIG_DM_SPI=y
>   CONFIG_MXC_SPI=y
>   CONFIG_DM_VIDEO=y
>   CONFIG_VIDEO_IPUV3=y
> +CONFIG_WATCHDOG_TIMEOUT_MSECS=6000
>   CONFIG_IMX_WATCHDOG=y
>   # CONFIG_EFI_LOADER is not set
> diff --git a/configs/kp_imx6q_tpc_defconfig b/configs/kp_imx6q_tpc_defconfig
> index 0ca83cbfea..7e9d2fc747 100644
> --- a/configs/kp_imx6q_tpc_defconfig
> +++ b/configs/kp_imx6q_tpc_defconfig
> @@ -40,5 +40,6 @@ CONFIG_FEC_MXC=y
>   CONFIG_MII=y
>   CONFIG_IMX_THERMAL=y
>   CONFIG_USB=y
> +CONFIG_WATCHDOG_TIMEOUT_MSECS=60000
>   CONFIG_IMX_WATCHDOG=y
>   CONFIG_OF_LIBFDT=y
> diff --git a/configs/m53menlo_defconfig b/configs/m53menlo_defconfig
> index 0e5fa01fde..6be311bf35 100644
> --- a/configs/m53menlo_defconfig
> +++ b/configs/m53menlo_defconfig
> @@ -69,6 +69,7 @@ CONFIG_USB_ETHER_SMSC95XX=y
>   CONFIG_VIDEO_IPUV3=y
>   CONFIG_VIDEO=y
>   # CONFIG_VIDEO_SW_CURSOR is not set
> +CONFIG_WATCHDOG_TIMEOUT_MSECS=8000
>   CONFIG_IMX_WATCHDOG=y
>   CONFIG_FAT_WRITE=y
>   CONFIG_OF_LIBFDT=y
> diff --git a/configs/mx53ppd_defconfig b/configs/mx53ppd_defconfig
> index 19ebab78e9..8c8e9a28ed 100644
> --- a/configs/mx53ppd_defconfig
> +++ b/configs/mx53ppd_defconfig
> @@ -49,4 +49,5 @@ CONFIG_USB_EHCI_MX5=y
>   CONFIG_VIDEO_IPUV3=y
>   CONFIG_VIDEO=y
>   # CONFIG_VIDEO_SW_CURSOR is not set
> +CONFIG_WATCHDOG_TIMEOUT_MSECS=8000
>   CONFIG_IMX_WATCHDOG=y
> diff --git a/configs/tqma6s_wru4_mmc_defconfig b/configs/tqma6s_wru4_mmc_defconfig
> index 57f2221c78..ea29fa967b 100644
> --- a/configs/tqma6s_wru4_mmc_defconfig
> +++ b/configs/tqma6s_wru4_mmc_defconfig
> @@ -66,5 +66,6 @@ CONFIG_USB=y
>   CONFIG_USB_STORAGE=y
>   CONFIG_USB_HOST_ETHER=y
>   CONFIG_USB_ETHER_SMSC95XX=y
> +CONFIG_WATCHDOG_TIMEOUT_MSECS=60000
>   CONFIG_IMX_WATCHDOG=y
>   CONFIG_OF_LIBFDT=y
> diff --git a/configs/warp_defconfig b/configs/warp_defconfig
> index a37d769296..e033cc9d8c 100644
> --- a/configs/warp_defconfig
> +++ b/configs/warp_defconfig
> @@ -39,5 +39,6 @@ CONFIG_USB_GADGET_VENDOR_NUM=0x0525
>   CONFIG_USB_GADGET_PRODUCT_NUM=0xa4a5
>   CONFIG_CI_UDC=y
>   CONFIG_USB_GADGET_DOWNLOAD=y
> +CONFIG_WATCHDOG_TIMEOUT_MSECS=30000
>   CONFIG_IMX_WATCHDOG=y
>   CONFIG_OF_LIBFDT=y
> diff --git a/drivers/watchdog/Kconfig b/drivers/watchdog/Kconfig
> index 5993865647..9784a998c4 100644
> --- a/drivers/watchdog/Kconfig
> +++ b/drivers/watchdog/Kconfig
> @@ -8,6 +8,15 @@ config WATCHDOG
>   	  this option if you want to service enabled watchdog by U-Boot. Disable
>   	  this option if you want U-Boot to start watchdog but never service it.
>   
> +config WATCHDOG_TIMEOUT_MSECS
> +	int "Watchdog timeout in msec"
> +	default 128000 if ARCH_MX25 || ARCH_MX31 || ARCH_MX5 || ARCH_MX6
> +	default 128000 if ARCH_MX7 || ARCH_VF610
> +	default 30000 if ARCH_SOCFPGA
> +	default 60000
> +	help
> +	  Watchdog timeout in msec
> +
>   config HW_WATCHDOG
>   	bool
>   
> diff --git a/include/configs/MPC8349ITX.h b/include/configs/MPC8349ITX.h
> index a3f704c73b..c395d62379 100644
> --- a/include/configs/MPC8349ITX.h
> +++ b/include/configs/MPC8349ITX.h
> @@ -209,12 +209,6 @@ boards, we say we have two, but don't display a message if we find only one. */
>   
>   #define CONFIG_SYS_VSC7385_BASE	0xF8000000
>   
> -#ifdef CONFIG_VSC7385_ENET
> -
> -
> -#endif
> -
> -
>   #define CONFIG_SYS_LED_BASE	0xF9000000
>   
>   
> diff --git a/include/configs/MPC837XERDB.h b/include/configs/MPC837XERDB.h
> index 13a7682958..37f51ba743 100644
> --- a/include/configs/MPC837XERDB.h
> +++ b/include/configs/MPC837XERDB.h
> @@ -186,11 +186,6 @@
>   
>   #define CONFIG_SYS_VSC7385_BASE	0xF0000000
>   
> -#ifdef CONFIG_VSC7385_ENET
> -
> -
> -#endif
> -
>   /*
>    * Serial Port
>    */
> diff --git a/include/configs/dh_imx6.h b/include/configs/dh_imx6.h
> index 3eee382a64..54b61a0a06 100644
> --- a/include/configs/dh_imx6.h
> +++ b/include/configs/dh_imx6.h
> @@ -98,7 +98,6 @@
>   #endif
>   
>   /* Watchdog */
> -#define CONFIG_WATCHDOG_TIMEOUT_MSECS	60000
>   
>   /* allow to overwrite serial and ethaddr */
>   #define CONFIG_ENV_OVERWRITE
> diff --git a/include/configs/display5.h b/include/configs/display5.h
> index 8829cbad91..9d7cb270a8 100644
> --- a/include/configs/display5.h
> +++ b/include/configs/display5.h
> @@ -361,7 +361,6 @@
>   /* Commands */
>   
>   /* Watchdog */
> -#define CONFIG_WATCHDOG_TIMEOUT_MSECS   15000
>   
>   /* ENV config */
>   #ifdef CONFIG_ENV_IS_IN_SPI_FLASH
> diff --git a/include/configs/ge_bx50v3.h b/include/configs/ge_bx50v3.h
> index 0481ed06a9..4bc2a8878b 100644
> --- a/include/configs/ge_bx50v3.h
> +++ b/include/configs/ge_bx50v3.h
> @@ -28,8 +28,6 @@
>   #define CONFIG_REVISION_TAG
>   #define CONFIG_SYS_MALLOC_LEN		(10 * SZ_1M)
>   
> -#define CONFIG_WATCHDOG_TIMEOUT_MSECS 6000
> -
>   #define CONFIG_MXC_UART
>   
>   /* SATA Configs */
> diff --git a/include/configs/kp_imx6q_tpc.h b/include/configs/kp_imx6q_tpc.h
> index d2ebf92953..4d075b47f6 100644
> --- a/include/configs/kp_imx6q_tpc.h
> +++ b/include/configs/kp_imx6q_tpc.h
> @@ -62,7 +62,6 @@
>   #endif
>   
>   /* Watchdog */
> -#define CONFIG_WATCHDOG_TIMEOUT_MSECS	60000
>   
>   /* allow to overwrite serial and ethaddr */
>   #define CONFIG_ENV_OVERWRITE
> diff --git a/include/configs/m53menlo.h b/include/configs/m53menlo.h
> index fc0b1f480c..ff6354904b 100644
> --- a/include/configs/m53menlo.h
> +++ b/include/configs/m53menlo.h
> @@ -156,7 +156,6 @@
>   #define CONFIG_FSL_IIM
>   
>   /* Watchdog */
> -#define CONFIG_WATCHDOG_TIMEOUT_MSECS 8000
>   
>   /*
>    * Boot Linux
> diff --git a/include/configs/mx53ppd.h b/include/configs/mx53ppd.h
> index 2d6715cba2..2944415d7f 100644
> --- a/include/configs/mx53ppd.h
> +++ b/include/configs/mx53ppd.h
> @@ -22,8 +22,6 @@
>   /* Size of malloc() pool */
>   #define CONFIG_SYS_MALLOC_LEN		(10 * 1024 * 1024)
>   
> -#define CONFIG_WATCHDOG_TIMEOUT_MSECS 8000
> -
>   #define CONFIG_BOARD_LATE_INIT
>   #define CONFIG_REVISION_TAG
>   
> diff --git a/include/configs/socfpga_common.h b/include/configs/socfpga_common.h
> index d1034ac280..d6a7caee19 100644
> --- a/include/configs/socfpga_common.h
> +++ b/include/configs/socfpga_common.h
> @@ -108,7 +108,6 @@
>   #define CONFIG_DESIGNWARE_WATCHDOG
>   #define CONFIG_DW_WDT_BASE		SOCFPGA_L4WD0_ADDRESS
>   #define CONFIG_DW_WDT_CLOCK_KHZ		25000
> -#define CONFIG_WATCHDOG_TIMEOUT_MSECS	30000
>   #endif
>   
>   /*
> diff --git a/include/configs/socfpga_stratix10_socdk.h b/include/configs/socfpga_stratix10_socdk.h
> index 8d2971c6e2..27f87e75df 100644
> --- a/include/configs/socfpga_stratix10_socdk.h
> +++ b/include/configs/socfpga_stratix10_socdk.h
> @@ -167,7 +167,6 @@ unsigned int cm_get_qspi_controller_clk_hz(void);
>   unsigned int cm_get_l4_sys_free_clk_hz(void);
>   #define CONFIG_DW_WDT_CLOCK_KHZ		(cm_get_l4_sys_free_clk_hz() / 1000)
>   #endif
> -#define CONFIG_WATCHDOG_TIMEOUT_MSECS	3000
>   #endif
>   
>   /*
> diff --git a/include/configs/tqma6_wru4.h b/include/configs/tqma6_wru4.h
> index 34f000f214..0af52e5565 100644
> --- a/include/configs/tqma6_wru4.h
> +++ b/include/configs/tqma6_wru4.h
> @@ -17,7 +17,6 @@
>   #define CONSOLE_DEV		"ttymxc3"
>   
>   /* Watchdog */
> -#define CONFIG_WATCHDOG_TIMEOUT_MSECS	60000
>   
>   /* Config on-board RTC */
>   #define CONFIG_RTC_DS1337
> diff --git a/include/configs/warp.h b/include/configs/warp.h
> index 5345f5314d..41fd6c759e 100644
> --- a/include/configs/warp.h
> +++ b/include/configs/warp.h
> @@ -25,7 +25,6 @@
>   #define CONFIG_SYS_FSL_ESDHC_HAS_DDR_MODE
>   
>   /* Watchdog */
> -#define CONFIG_WATCHDOG_TIMEOUT_MSECS 30000 /* 30s */
>   
>   #define CONFIG_SYS_MEMTEST_START	0x80000000
>   #define CONFIG_SYS_MEMTEST_END		(CONFIG_SYS_MEMTEST_START + SZ_256M)
> diff --git a/include/wdt.h b/include/wdt.h
> index 5bcff24ab3..e833d3a772 100644
> --- a/include/wdt.h
> +++ b/include/wdt.h
> @@ -107,9 +107,6 @@ struct wdt_ops {
>   };
>   
>   #if CONFIG_IS_ENABLED(WDT)
> -#ifndef CONFIG_WATCHDOG_TIMEOUT_MSECS
> -#define CONFIG_WATCHDOG_TIMEOUT_MSECS	(60 * 1000)
> -#endif
>   #define WATCHDOG_TIMEOUT_SECS	(CONFIG_WATCHDOG_TIMEOUT_MSECS / 1000)
>   
>   static inline int initr_watchdog(void)
> diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt
> index 8651d569c5..921dc5290c 100644
> --- a/scripts/config_whitelist.txt
> +++ b/scripts/config_whitelist.txt
> @@ -4451,7 +4451,6 @@ CONFIG_WATCHDOG_NOWAYOUT
>   CONFIG_WATCHDOG_PRESC
>   CONFIG_WATCHDOG_RC
>   CONFIG_WATCHDOG_TIMEOUT
> -CONFIG_WATCHDOG_TIMEOUT_MSECS
>   CONFIG_WD_PERIOD
>   CONFIG_X600
>   CONFIG_X86EMU_DEBUG
> 

Viele Grüße,
Stefan

-- 
DENX Software Engineering GmbH,      Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-51 Fax: (+49)-8142-66989-80 Email: sr at denx.de


More information about the U-Boot mailing list