Convert CONFIG_SAMSUNG_ONENAND to Kconfig

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

diff --git a/include/watchdog.h b/include/watchdog.h
index 3a357de..813cc8f 100644 (file)
--- a/include/watchdog.h
+++ b/include/watchdog.h
@@ -49,11 +49,17 @@ int init_func_watchdog_reset(void);
         */
        #if defined(CONFIG_WATCHDOG)
                #if defined(__ASSEMBLY__)
-                       #define WATCHDOG_RESET bl watchdog_reset
+                       /* Don't require the watchdog to be enabled in SPL */
+                       #if defined(CONFIG_SPL_BUILD) &&                \
+                               !defined(CONFIG_SPL_WATCHDOG)
+                               #define WATCHDOG_RESET /*XXX DO_NOT_DEL_THIS_COMMENT*/
+                       #else
+                               #define WATCHDOG_RESET bl watchdog_reset
+                       #endif
                #else
                        /* Don't require the watchdog to be enabled in SPL */
                        #if defined(CONFIG_SPL_BUILD) &&                \
-                               !defined(CONFIG_SPL_WATCHDOG_SUPPORT)
+                               !defined(CONFIG_SPL_WATCHDOG)
                                #define WATCHDOG_RESET() {}
                        #else
                                extern void watchdog_reset(void);
@@ -77,7 +83,7 @@ int init_func_watchdog_reset(void);
  * Prototypes from $(CPU)/cpu.c.
  */
 
-#if defined(CONFIG_HW_WATCHDOG) && !defined(__ASSEMBLY__)
+#if (defined(CONFIG_HW_WATCHDOG) || defined(CONFIG_WATCHDOG)) && !defined(__ASSEMBLY__)
        void hw_watchdog_init(void);
 #endif