Mirrors/u-boot
2
0
Fork 0
mirror of https://github.com/AsahiLinux/u-boot synced 2024-11-10 23:24:38 +00:00
Code Issues Projects Releases Packages Wiki Activity

wdt: Unify option of timeout value

Browse source 
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>
This commit is contained in:
Andy Shevchenko 2017-07-05 20:44:08 +03:00 committed by Tom Rini
parent b71e0c1a30
commit ea926511dc
3 changed files with 2 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
drivers/watchdog/designware_wdt.c
View file

@ -65,7 +65,7 @@ void hw_watchdog_init(void)
/* reset to disable the watchdog */ /* reset to disable the watchdog */
hw_watchdog_reset(); hw_watchdog_reset();
/* set timer in miliseconds */ /* set timer in miliseconds */
designware_wdt_settimeout(CONFIG_HW_WATCHDOG_TIMEOUT_MS); designware_wdt_settimeout(CONFIG_WATCHDOG_TIMEOUT_MSECS);
/* enable the watchdog */ /* enable the watchdog */
designware_wdt_enable(); designware_wdt_enable();
/* reset the watchdog */ /* reset the watchdog */

2
include/configs/socfpga_common.h
View file

@ -131,7 +131,7 @@
#define CONFIG_DESIGNWARE_WATCHDOG #define CONFIG_DESIGNWARE_WATCHDOG
#define CONFIG_DW_WDT_BASE SOCFPGA_L4WD0_ADDRESS #define CONFIG_DW_WDT_BASE SOCFPGA_L4WD0_ADDRESS
#define CONFIG_DW_WDT_CLOCK_KHZ 25000 #define CONFIG_DW_WDT_CLOCK_KHZ 25000
#define CONFIG_HW_WATCHDOG_TIMEOUT_MS 30000 #define CONFIG_WATCHDOG_TIMEOUT_MSECS 30000
#endif #endif
/* /*

1
scripts/config_whitelist.txt
View file

@ -1113,7 +1113,6 @@ CONFIG_HUSH_INIT_VAR
CONFIG_HVBOOT CONFIG_HVBOOT
CONFIG_HWCONFIG CONFIG_HWCONFIG
CONFIG_HW_ENV_SETTINGS CONFIG_HW_ENV_SETTINGS
CONFIG_HW_WATCHDOG_TIMEOUT_MS
CONFIG_I2C CONFIG_I2C
CONFIG_I2C_CHIPADDRESS CONFIG_I2C_CHIPADDRESS
CONFIG_I2C_CMD_TREE CONFIG_I2C_CMD_TREE