]> git.dujemihanovic.xyz Git - u-boot.git/commitdiff
watchdog: Remove WATCHDOG_RESET macro
authorStefan Roese <sr@denx.de>
Fri, 2 Sep 2022 12:10:48 +0000 (14:10 +0200)
committerStefan Roese <sr@denx.de>
Sun, 18 Sep 2022 08:26:43 +0000 (10:26 +0200)
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@denx.de>
Reviewed-by: Simon Glass <sjg@chromium.org>
Tested-by: Tom Rini <trini@konsulko.com> [am335x_evm, mx6cuboxi, rpi_3,dra7xx_evm, pine64_plus, am65x_evm, j721e_evm]
include/watchdog.h

index 1365b154a2956512d79527f30c2c21b9e2e44b80..91506d3327a86a2e12ea638e61ce47dbc8b3c7fb 100644 (file)
@@ -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.
  */