watchdog: Remove WATCHDOG_RESET macro
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]
This commit is contained in:
parent
ff3fdfe89b
commit
942d07df0e
@ -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.
|
||||
*/
|
||||
|
Loading…
Reference in New Issue
Block a user