]> git.dujemihanovic.xyz Git - u-boot.git/commit
watchdog: Don't select CONFIG_WATCHDOG and CONFIG_HW_WATCHDOG at the same time
authorChristophe Leroy <christophe.leroy@c-s.fr>
Wed, 26 Feb 2020 16:17:52 +0000 (16:17 +0000)
committerTom Rini <trini@konsulko.com>
Fri, 28 Feb 2020 15:53:55 +0000 (10:53 -0500)
commit7e00e907f51fd9335127c323d6a0eacdbb7e7013
treee865521183ceb2d8968e0dc2bae312d5381eee29
parenta68256074f4239008c6d5c936bc0f8857f3d1b8a
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>
drivers/watchdog/Kconfig