[PATCH v1 5/6] watchdog: Remove WATCHDOG_RESET macro
Stefan Roese
sr at denx.de
Fri Sep 2 14:10:48 CEST 2022
Now that we've globally replaced all WATCHDOG_RESET occurances, let's
remove the ugly macro itself in the header.
Signed-off-by: Stefan Roese <sr at denx.de>
Reviewed-by: Simon Glass <sjg at chromium.org>
---
v1:
- Add Simon's SoB tag
include/watchdog.h | 36 ------------------------------------
1 file changed, 36 deletions(-)
diff --git a/include/watchdog.h b/include/watchdog.h
index 1365b154a295..91506d3327a8 100644
--- a/include/watchdog.h
+++ b/include/watchdog.h
@@ -34,42 +34,6 @@ int init_func_watchdog_reset(void);
# error "Configuration error: CONFIG_HW_WATCHDOG and CONFIG_WATCHDOG can't be used together."
#endif
-/*
- * Hardware watchdog
- */
-#ifdef CONFIG_HW_WATCHDOG
- extern void hw_watchdog_reset(void);
-
- #define WATCHDOG_RESET hw_watchdog_reset
-#else
- /*
- * Maybe a software watchdog?
- */
- #if defined(CONFIG_WATCHDOG)
- /* Don't require the watchdog to be enabled in SPL */
- #if defined(CONFIG_SPL_BUILD) && \
- !defined(CONFIG_SPL_WATCHDOG)
- #define WATCHDOG_RESET() { \
- cyclic_run(); \
- }
- #else
- extern void watchdog_reset(void);
-
- #define WATCHDOG_RESET() { \
- watchdog_reset(); \
- cyclic_run(); \
- }
- #endif
- #else
- /*
- * No hardware or software watchdog.
- */
- #define WATCHDOG_RESET() { \
- cyclic_run(); \
- }
- #endif /* CONFIG_WATCHDOG */
-#endif /* CONFIG_HW_WATCHDOG */
-
/*
* Prototypes from $(CPU)/cpu.c.
*/
--
2.37.3
More information about the U-Boot
mailing list