From: Lukasz Majewski <lukma@denx.de>
To: u-boot@lists.denx.de
Subject: [U-Boot] [PATCH v1 2/4] Convert CONFIG_WATCHDOG_TIMEOUT_MSECS to Kconfig
Date: Tue, 6 Feb 2018 21:00:04 +0100 [thread overview]
Message-ID: <20180206200006.2461-3-lukma@denx.de> (raw)
In-Reply-To: <20180206200006.2461-1-lukma@denx.de>
This converts the following to Kconfig:
CONFIG_WATCHDOG_TIMEOUT_MSECS
The CONFIG_WATCHDOG_TIMEOUT_MSECS default value has been set to 10s.
Signed-off-by: Lukasz Majewski <lukma@denx.de>
---
configs/dh_imx6_defconfig | 1 +
configs/mx53ppd_defconfig | 1 +
configs/tqma6s_wru4_mmc_defconfig | 1 +
configs/warp_defconfig | 1 +
drivers/watchdog/Kconfig | 8 ++++++++
include/configs/dh_imx6.h | 3 ---
include/configs/mx53ppd.h | 2 --
include/configs/socfpga_common.h | 1 -
include/configs/tqma6_wru4.h | 3 ---
include/configs/warp.h | 3 ---
10 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/configs/dh_imx6_defconfig b/configs/dh_imx6_defconfig
index 48c5c7027a..0e7df6b10a 100644
--- a/configs/dh_imx6_defconfig
+++ b/configs/dh_imx6_defconfig
@@ -58,3 +58,4 @@ CONFIG_CI_UDC=y
CONFIG_USB_GADGET_DOWNLOAD=y
CONFIG_IMX_WATCHDOG=y
CONFIG_OF_LIBFDT=y
+CONFIG_WATCHDOG_TIMEOUT_MSECS=60000
diff --git a/configs/mx53ppd_defconfig b/configs/mx53ppd_defconfig
index 1458b93144..64dee33045 100644
--- a/configs/mx53ppd_defconfig
+++ b/configs/mx53ppd_defconfig
@@ -31,3 +31,4 @@ CONFIG_VIDEO=y
# CONFIG_VIDEO_SW_CURSOR is not set
CONFIG_IMX_WATCHDOG=y
CONFIG_OF_LIBFDT=y
+CONFIG_WATCHDOG_TIMEOUT_MSECS=8000
diff --git a/configs/tqma6s_wru4_mmc_defconfig b/configs/tqma6s_wru4_mmc_defconfig
index e30b7c5970..4e1be700e8 100644
--- a/configs/tqma6s_wru4_mmc_defconfig
+++ b/configs/tqma6s_wru4_mmc_defconfig
@@ -59,3 +59,4 @@ CONFIG_USB_HOST_ETHER=y
CONFIG_USB_ETHER_SMSC95XX=y
CONFIG_IMX_WATCHDOG=y
CONFIG_OF_LIBFDT=y
+CONFIG_WATCHDOG_TIMEOUT_MSECS=60000
diff --git a/configs/warp_defconfig b/configs/warp_defconfig
index 0aa7aeb57d..891d00e7e3 100644
--- a/configs/warp_defconfig
+++ b/configs/warp_defconfig
@@ -36,3 +36,4 @@ CONFIG_CI_UDC=y
CONFIG_USB_GADGET_DOWNLOAD=y
CONFIG_IMX_WATCHDOG=y
CONFIG_OF_LIBFDT=y
+CONFIG_WATCHDOG_TIMEOUT_MSECS=30000
diff --git a/drivers/watchdog/Kconfig b/drivers/watchdog/Kconfig
index 067d3915ae..bc4e9a6e84 100644
--- a/drivers/watchdog/Kconfig
+++ b/drivers/watchdog/Kconfig
@@ -40,6 +40,14 @@ config ULP_WATCHDOG
help
Say Y here to enable i.MX7ULP watchdog driver.
+config WATCHDOG_TIMEOUT_MSECS
+ int "Specify watchdog timeout in mili seconds"
+ default 30000 if ARCH_SOCFPGA
+ default 10000
+ depends on HW_WATCHDOG
+ help
+ Set watchdog trigger timeout (in [ms]).
+
config WDT
bool "Enable driver model for watchdog timer drivers"
depends on DM
diff --git a/include/configs/dh_imx6.h b/include/configs/dh_imx6.h
index 7b47fc6887..6c945979fb 100644
--- a/include/configs/dh_imx6.h
+++ b/include/configs/dh_imx6.h
@@ -125,9 +125,6 @@
#endif
#endif
-/* Watchdog */
-#define CONFIG_WATCHDOG_TIMEOUT_MSECS 60000
-
/* allow to overwrite serial and ethaddr */
#define CONFIG_ENV_OVERWRITE
diff --git a/include/configs/mx53ppd.h b/include/configs/mx53ppd.h
index 4fa850d211..1c7f066354 100644
--- a/include/configs/mx53ppd.h
+++ b/include/configs/mx53ppd.h
@@ -23,8 +23,6 @@
/* Size of malloc() pool */
#define CONFIG_SYS_MALLOC_LEN (10 * 1024 * 1024)
-#define CONFIG_WATCHDOG_TIMEOUT_MSECS 8000
-
#define CONFIG_MISC_INIT_R
#define CONFIG_BOARD_LATE_INIT
#define CONFIG_MXC_GPIO
diff --git a/include/configs/socfpga_common.h b/include/configs/socfpga_common.h
index bbc1f3de9b..7cde63e4ad 100644
--- a/include/configs/socfpga_common.h
+++ b/include/configs/socfpga_common.h
@@ -120,7 +120,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/tqma6_wru4.h b/include/configs/tqma6_wru4.h
index f35a048209..41dd192e5d 100644
--- a/include/configs/tqma6_wru4.h
+++ b/include/configs/tqma6_wru4.h
@@ -19,9 +19,6 @@
#define CONFIG_MISC_INIT_R
-/* Watchdog */
-#define CONFIG_WATCHDOG_TIMEOUT_MSECS 60000
-
/* Config on-board RTC */
#define CONFIG_RTC_DS1337
#define CONFIG_SYS_RTC_BUS_NUM 2
diff --git a/include/configs/warp.h b/include/configs/warp.h
index e5421d1930..dc0ee391bf 100644
--- a/include/configs/warp.h
+++ b/include/configs/warp.h
@@ -26,9 +26,6 @@
#define CONFIG_SYS_FSL_ESDHC_HAS_DDR_MODE
#define CONFIG_SUPPORT_EMMC_BOOT
-/* 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)
--
2.11.0
next prev parent reply other threads:[~2018-02-06 20:00 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-02-06 20:00 [U-Boot] [PATCH v1 0/4] Convert Watchdog related defines to Kconfig Lukasz Majewski
2018-02-06 20:00 ` [U-Boot] [PATCH v1 1/4] Convert CONFIG_IMX_WATCHDOG to Kconfig and remove HW_WATCHDOG Lukasz Majewski
2018-02-06 20:00 ` Lukasz Majewski [this message]
2018-02-07 7:05 ` [U-Boot] [PATCH v1 2/4] Convert CONFIG_WATCHDOG_TIMEOUT_MSECS to Kconfig Calvin Johnson
2018-02-06 20:00 ` [U-Boot] [PATCH v1 3/4] Convert socfpga: select CONFIG_HW_WATCHDOG support for ARCH_SOCFPGA Lukasz Majewski
2018-02-06 20:00 ` [U-Boot] [PATCH v1 4/4] Convert CONFIG_HW_WATCHDOG to Kconfig Lukasz Majewski
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20180206200006.2461-3-lukma@denx.de \
--to=lukma@denx.de \
--cc=u-boot@lists.denx.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox