From: Andy Shevchenko Date: Wed, 5 Jul 2017 17:44:08 +0000 (+0300) Subject: wdt: Unify option of timeout value X-Git-Tag: v2017.07~20 X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=ea926511dc72a929f5959b9f47e2e061e390ef2c;p=u-boot 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 Reviewed-by: Simon Glass Reviewed-by: Bin Meng Reviewed-by: Heiko Schocher --- 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