summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan Roese <sr@denx.de>2022-09-02 14:10:49 +0200
committerStefan Roese <sr@denx.de>2022-09-18 10:26:49 +0200
commit8695fbb3a7ff3640eff62f7123323b16546d5b35 (patch)
tree4403d1b2ff259014c01855e08191ad0d1c294741
parent942d07df0e7915fd9e83539a11fb160381072453 (diff)
downloadu-boot-8695fbb3a7ff3640eff62f7123323b16546d5b35.tar.gz
watchdog: Further cleanup
Remove some now unused macros and #ifdef's. 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]
-rw-r--r--include/watchdog.h6
1 files changed, 2 insertions, 4 deletions
diff --git a/include/watchdog.h b/include/watchdog.h
index 91506d3327..ac5f11e376 100644
--- a/include/watchdog.h
+++ b/include/watchdog.h
@@ -10,7 +10,6 @@
#ifndef _WATCHDOG_H_
#define _WATCHDOG_H_
-#if !defined(__ASSEMBLY__)
#include <cyclic.h>
/*
@@ -20,7 +19,6 @@
* and the legacy arch/<arch>/board.c code.
*/
int init_func_watchdog_reset(void);
-#endif
#if defined(CONFIG_WATCHDOG) || defined(CONFIG_HW_WATCHDOG)
#define INIT_FUNC_WATCHDOG_INIT init_func_watchdog_init,
@@ -38,11 +36,11 @@ int init_func_watchdog_reset(void);
* Prototypes from $(CPU)/cpu.c.
*/
-#if (defined(CONFIG_HW_WATCHDOG) || defined(CONFIG_WATCHDOG)) && !defined(__ASSEMBLY__)
+#if defined(CONFIG_HW_WATCHDOG) || defined(CONFIG_WATCHDOG)
void hw_watchdog_init(void);
#endif
-#if defined(CONFIG_MPC85xx) && !defined(__ASSEMBLY__)
+#if defined(CONFIG_MPC85xx)
void init_85xx_watchdog(void);
#endif
#endif /* _WATCHDOG_H_ */