From mboxrd@z Thu Jan 1 00:00:00 1970 From: Tom Rini Date: Fri, 28 Feb 2020 13:37:54 -0500 Subject: [PATCH] watchdog: Don't select CONFIG_WATCHDOG and CONFIG_HW_WATCHDOG at the same time In-Reply-To: References: Message-ID: <20200228183754.GM18302@bill-the-cat> List-Id: MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: u-boot@lists.denx.de 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 > Signed-off-by: Christophe Leroy > Reviewed-by: Stefan Roese 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: