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

[Tom Rini]

On Wed, Feb 26, 2020 at 04:17:52PM +0000, Christophe Leroy wrote:

> 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 at denx.de>
> Signed-off-by: Christophe Leroy <christophe.leroy at c-s.fr>
> Reviewed-by: Stefan Roese <sr at denx.de>

Applied to u-boot/master, thanks!

-- 
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 659 bytes
Desc: not available
URL: <https://lists.denx.de/pipermail/u-boot/attachments/20200228/71aa035e/attachment.sig>