watchdog: move WATCHDOG_TIMEOUT_MSECS to Kconfig
Subsystems (3)
PATCH v2 1/1 watchdog: move WATCHDOG_TIMEOUT_MSECS to Kconfig
move WATCHDOG_TIMEOUT_MSECS to Kconfig and fix all board defconfigs.
---
Patchseries build fine on travis see:
https://travis-ci.org/hsdenx/u-boot-test/builds/591305674
Based on mainline commit:d88eab4bcc: ("efi_loader: SetVariable() deleting variables")
Changes in v2:
- add Reviewed-by tag from Stefan
- add Acked-by tag from Lukasz and Martin
- rebased to
d88eab4bcc: ("efi_loader: SetVariable() deleting variables") Sorry to Stefan, who had requested a rebase and I missed the EMail...
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/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 - scripts/config_whitelist.txt | 1 - 22 files changed, 18 insertions(+), 14 deletions(-)
arch/arm/cpu/armv8/fsl-layerscape/doc/README.lsch2 +0 -1
@@ -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.
configs/dh_imx6_defconfig +1 -0
@@ -85,4 +85,5 @@ 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
configs/display5_defconfig +1 -0
@@ -82,4 +82,5 @@ CONFIG_MII=y CONFIG_MXC_UART=y CONFIG_SPI=y CONFIG_MXC_SPI=y +CONFIG_WATCHDOG_TIMEOUT_MSECS=15000 CONFIG_IMX_WATCHDOG=y
configs/display5_factory_defconfig +1 -0
@@ -87,5 +87,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
configs/ge_bx50v3_defconfig +1 -0
@@ -61,5 +61,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
configs/kp_imx6q_tpc_defconfig +1 -0
@@ -41,5 +41,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
configs/m53menlo_defconfig +1 -0
@@ -89,4 +89,5 @@ CONFIG_DM_VIDEO=y CONFIG_SYS_WHITE_ON_BLACK=y CONFIG_VIDEO_IPUV3=y CONFIG_IMX_WATCHDOG=y +CONFIG_WATCHDOG_TIMEOUT_MSECS=8000 CONFIG_FAT_WRITE=y
configs/mx53ppd_defconfig +1 -0
@@ -50,4 +50,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
configs/tqma6s_wru4_mmc_defconfig +1 -0
@@ -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
configs/warp_defconfig +1 -0
@@ -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
drivers/watchdog/Kconfig +9 -0
@@ -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
include/configs/dh_imx6.h +0 -1
@@ -88,7 +88,6 @@#endif /* Watchdog */ -#define CONFIG_WATCHDOG_TIMEOUT_MSECS 60000/* allow to overwrite serial and ethaddr */ #define CONFIG_ENV_OVERWRITE
include/configs/display5.h +0 -1
@@ -354,7 +354,6 @@ (CONFIG_SYS_INIT_RAM_ADDR +CONFIG_SYS_INIT_SP_OFFSET )/* Watchdog */ -#define CONFIG_WATCHDOG_TIMEOUT_MSECS 15000 /* ENV config */#ifdef CONFIG_ENV_IS_IN_SPI_FLASH
include/configs/ge_bx50v3.h +0 -2
@@ -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 */
include/configs/kp_imx6q_tpc.h +0 -1
@@ -60,7 +60,6 @@#endif /* Watchdog */ -#define CONFIG_WATCHDOG_TIMEOUT_MSECS 60000/* allow to overwrite serial and ethaddr */ #define CONFIG_ENV_OVERWRITE
include/configs/m53menlo.h +0 -1
@@ -153,7 +153,6 @@#define CONFIG_FSL_IIM /* Watchdog */ -#define CONFIG_WATCHDOG_TIMEOUT_MSECS 8000/* * Boot Linux
include/configs/mx53ppd.h +0 -2
@@ -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
include/configs/socfpga_common.h +0 -1
@@ -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 /*
include/configs/socfpga_stratix10_socdk.h +0 -1
@@ -168,7 +168,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 /*
include/configs/tqma6_wru4.h +0 -1
@@ -17,7 +17,6 @@#define CONSOLE_DEV "ttymxc3"/* Watchdog */ -#define CONFIG_WATCHDOG_TIMEOUT_MSECS 60000/* Config on-board RTC */ #define CONFIG_RTC_DS1337
include/configs/warp.h +0 -1
@@ -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)
scripts/config_whitelist.txt +0 -1
@@ -4347,7 +4347,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
Signature · 1 line
2.21.0
PATCH v2 1/1 watchdog: move WATCHDOG_TIMEOUT_MSECS to Kconfig
Quoted 39 lines · Heiko Schocher
move
WATCHDOG_TIMEOUT_MSECStoKconfigand fix all board defconfigs.Signed-off-by Heiko Schocher <[email protected]>Reviewed-by Stefan Roese <[email protected]>Acked-by Lukasz Majewski <[email protected]>Acked-by Martyn Welch <[email protected]>---
Patchseries build fine on travis see:
https://travis-ci.org/hsdenx/u-boot-test/builds/591305674Based on mainline commit:
d88eab4bcc: ("efi_loader:SetVariable()deleting variables")Changes in v2:
- add Reviewed-by tag from Stefan
- add Acked-by tag from Lukasz and Martin
- rebased to
d88eab4bcc: ("efi_loader:SetVariable()deleting variables") Sorry to Stefan, who had requested a rebase and I missed the EMail...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/dh_imx6.h | 1 - include/configs/display5.h | 1 - include/configs/ge_bx50v3.h | 2 -- include/configs/kp_imx6q_tpc.h | 1 -
Quoted 8 lines
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 - scripts/config_whitelist.txt | 1 - 22 files changed, 18 insertions(+), 14 deletions(-)
Applied to u-boot-mavell/master
Thanks,
Stefan