configs: rpi: set NR_DRAM_BANKS to four

[oweals/u-boot.git] / include / watchdog.h

diff --git a/include/watchdog.h b/include/watchdog.h
index 14073cfdd2fc7e06760b04e2642c763e95e879d1..a4a4e8e614e4af30f75b651d62e7dd3f9d4bff2d 100644 (file)
--- a/include/watchdog.h
+++ b/include/watchdog.h
@@ -51,9 +51,15 @@ int init_func_watchdog_reset(void);
                #if defined(__ASSEMBLY__)
                        #define WATCHDOG_RESET bl watchdog_reset
                #else
-                       extern void watchdog_reset(void);
+                       /* Don't require the watchdog to be enabled in SPL */
+                       #if defined(CONFIG_SPL_BUILD) &&                \
+                               !defined(CONFIG_SPL_WATCHDOG_SUPPORT)
+                               #define WATCHDOG_RESET() {}
+                       #else
+                               extern void watchdog_reset(void);
 
-                       #define WATCHDOG_RESET watchdog_reset
+                               #define WATCHDOG_RESET watchdog_reset
+                       #endif
                #endif
        #else
                /*
@@ -71,7 +77,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