diff options
| author | Andy Shevchenko <andriy.shevchenko@linux.intel.com> | 2017-07-05 20:44:08 +0300 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2017-07-07 07:38:23 -0400 |
| commit | ea926511dc72a929f5959b9f47e2e061e390ef2c (patch) | |
| tree | 3a6c8b07899f6d5849a7e8b1b2fc1ebbe9a43c3c | |
| parent | b71e0c1a300e8f2f69e6e19410cf031b7cac05bb (diff) | |
| download | u-boot-midas-ea926511dc72a929f5959b9f47e2e061e390ef2c.tar.gz u-boot-midas-ea926511dc72a929f5959b9f47e2e061e390ef2c.tar.bz2 u-boot-midas-ea926511dc72a929f5959b9f47e2e061e390ef2c.zip | |
wdt: Unify option of timeout value
There is no need to duplicate same option with different name.
Kill HW_WATCHDOG_TIMEOUT_MS in favor of WATCHDOG_TIMEOUT_MSECS.
Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Reviewed-by: Simon Glass <sjg@chromium.org>
Reviewed-by: Bin Meng <bmeng.cn@gmail.com>
Reviewed-by: Heiko Schocher <hs@denx.de>
| -rw-r--r-- | drivers/watchdog/designware_wdt.c | 2 | ||||
| -rw-r--r-- | include/configs/socfpga_common.h | 2 | ||||
| -rw-r--r-- | scripts/config_whitelist.txt | 1 |
3 files changed, 2 insertions, 3 deletions
diff --git a/drivers/watchdog/designware_wdt.c b/drivers/watchdog/designware_wdt.c index e788e1b65d..8ec094d994 100644 --- a/drivers/watchdog/designware_wdt.c +++ b/drivers/watchdog/designware_wdt.c @@ -65,7 +65,7 @@ void hw_watchdog_init(void) /* reset to disable the watchdog */ hw_watchdog_reset(); /* set timer in miliseconds */ - designware_wdt_settimeout(CONFIG_HW_WATCHDOG_TIMEOUT_MS); + designware_wdt_settimeout(CONFIG_WATCHDOG_TIMEOUT_MSECS); /* enable the watchdog */ designware_wdt_enable(); /* reset the watchdog */ diff --git a/include/configs/socfpga_common.h b/include/configs/socfpga_common.h index fd18ae5f5d..c17814bf01 100644 --- a/include/configs/socfpga_common.h +++ b/include/configs/socfpga_common.h @@ -131,7 +131,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 30000 +#define CONFIG_WATCHDOG_TIMEOUT_MSECS 30000 #endif /* diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index de4bdb3d37..54eee53572 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -1113,7 +1113,6 @@ CONFIG_HUSH_INIT_VAR CONFIG_HVBOOT CONFIG_HWCONFIG CONFIG_HW_ENV_SETTINGS -CONFIG_HW_WATCHDOG_TIMEOUT_MS CONFIG_I2C CONFIG_I2C_CHIPADDRESS CONFIG_I2C_CMD_TREE |