diff mbox series

[v3,54/81] imx: watchdog: Correct watchdog error condition

Message ID 20230206190550.1692420-55-sjg@chromium.org
State RFC
Delegated to: Tom Rini
Headers show
Series RFC: Migrate to split config | expand

Commit Message

Simon Glass Feb. 6, 2023, 7:05 p.m. UTC 
This is intended to make sure that one of the conditions is met, but
causes a build error with imx6qdl_icore_mmc.

Fix it by using the PPL condition instead, so that nothing changes when
building for SPL with split config.

In fact we should drop the old watchdog code and just use the new
watchdog uclass.

Signed-off-by: Simon Glass <sjg@chromium.org>
---

(no changes since v1)

 include/watchdog.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
diff mbox series

Patch

diff --git a/include/watchdog.h b/include/watchdog.h
index ac5f11e376f..f000bdfae80 100644
--- a/include/watchdog.h
+++ b/include/watchdog.h
@@ -28,7 +28,7 @@  int init_func_watchdog_reset(void);
 #define INIT_FUNC_WATCHDOG_RESET
 #endif
 
-#if defined(CONFIG_HW_WATCHDOG) && defined(CONFIG_WATCHDOG)
+#if defined(CONFIG_HW_WATCHDOG) && defined(CONFIG_PPL_WATCHDOG)
 #  error "Configuration error: CONFIG_HW_WATCHDOG and CONFIG_WATCHDOG can't be used together."
 #endif