MIPS: convert CONFIG_SYS_MIPS_TIMER_FREQ to Kconfig

[platform/kernel/u-boot.git] / include / watchdog.h

diff --git a/include/watchdog.h b/include/watchdog.h
index 1365b15..ac5f11e 100644 (file)
--- 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,
@@ -35,50 +33,14 @@ int init_func_watchdog_reset(void);
 #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.
  */
 
-#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_ */