diff options
| author | Christophe Leroy | 2020-02-26 16:17:52 +0000 |
|---|---|---|
| committer | Tom Rini | 2020-02-28 10:53:55 -0500 |
| commit | 7e00e907f51fd9335127c323d6a0eacdbb7e7013 (patch) | |
| tree | e865521183ceb2d8968e0dc2bae312d5381eee29 /drivers | |
| parent | a68256074f4239008c6d5c936bc0f8857f3d1b8a (diff) | |
watchdog: Don't select CONFIG_WATCHDOG and CONFIG_HW_WATCHDOG at the same time
Commit 06985289d452 ("watchdog: Implement generic watchdog_reset()
version") introduced an automatic selection of CONFIG_WATCHDOG by
CONFIG_WDT. But for boards selecting CONFIG_HW_WATCHDOG, like
boards have a powerpc 8xx, CONFIG_WATCHDOG shall not be selected
as they are mutually exclusive.
Make CONFIG_WATCHDOG dependent on !CONFIG_HW_WATCHDOG
Fixes: 06985289d452 ("watchdog: Implement generic watchdog_reset() version")
Cc: Stefan Roese <sr@denx.de>
Signed-off-by: Christophe Leroy <christophe.leroy@c-s.fr>
Reviewed-by: Stefan Roese <sr@denx.de>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/watchdog/Kconfig | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/watchdog/Kconfig b/drivers/watchdog/Kconfig index fbb561b995f..d24c1e48353 100644 --- a/drivers/watchdog/Kconfig +++ b/drivers/watchdog/Kconfig @@ -2,6 +2,7 @@ menu "Watchdog Timer Support" config WATCHDOG bool "Enable U-Boot watchdog reset" + depends on !HW_WATCHDOG help This option enables U-Boot watchdog support where U-Boot is using watchdog_reset function to service watchdog device in U-Boot. Enable |