[U-Boot] [PATCH v1 3/3] wdt: Unify option of timeout value

[Heiko Schocher]

Hello Andy,

Am 05.07.2017 um 19:44 schrieb Andy Shevchenko:
> 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 at linux.intel.com>
> ---
>   drivers/watchdog/designware_wdt.c | 2 +-
>   include/configs/socfpga_common.h  | 2 +-
>   scripts/config_whitelist.txt      | 1 -
>   3 files changed, 2 insertions(+), 3 deletions(-)

Good catch!

May I ask, if you find time to move CONFIG_WATCHDOG_TIMEOUT_MSECS
to Kconfig?

Reviewed-by: Heiko Schocher <hs at denx.de>

bye,
Heiko
>
> 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 95f27b6ead..73701bcaf8 100644
> --- a/scripts/config_whitelist.txt
> +++ b/scripts/config_whitelist.txt
> @@ -1121,7 +1121,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
>

-- 
DENX Software Engineering GmbH,      Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany