| Message ID | f34d36d932a158e5b13982fa24304fc27a760474.1582733790.git.christophe.leroy@c-s.fr |
|---|---|
| State | Accepted |
| Commit | 7e00e907f51fd9335127c323d6a0eacdbb7e7013 |
| Headers | show |
| Series | watchdog: Don't select CONFIG_WATCHDOG and CONFIG_HW_WATCHDOG at the same time | expand |
On 26.02.20 17:17, 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> Thanks, Stefan
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!
diff --git a/drivers/watchdog/Kconfig b/drivers/watchdog/Kconfig index fbb561b995f1..d24c1e48353f 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
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> --- drivers/watchdog/Kconfig | 1 + 1 file changed, 1 insertion(+)