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

watchdog: Don't select CONFIG_WATCHDOG and CONFIG_HW_WATCHDOG at the same time

Browse source 
Commit 06985289d4 ("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: 06985289d4 ("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>
This commit is contained in:
Christophe Leroy 2020-02-26 16:17:52 +00:00 committed by Tom Rini
parent a68256074f
commit 7e00e907f5
1 changed files with 1 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
drivers/watchdog/Kconfig
View file

@ -2,6 +2,7 @@ menu "Watchdog Timer Support"
config WATCHDOG config WATCHDOG
bool "Enable U-Boot watchdog reset" bool "Enable U-Boot watchdog reset"
depends on !HW_WATCHDOG
help help
This option enables U-Boot watchdog support where U-Boot is using This option enables U-Boot watchdog support where U-Boot is using
watchdog_reset function to service watchdog device in U-Boot. Enable watchdog_reset function to service watchdog device in U-Boot. Enable