diff options
| author | Tom Rini <trini@konsulko.com> | 2019-04-09 12:10:40 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2019-04-09 12:10:40 -0400 |
| commit | 5a451f11c800cde986386aa7cab464b40260ae3c (patch) | |
| tree | 0c38454238a3ee787ba72f304fc25b7921845222 /include/watchdog.h | |
| parent | 1d63ec3fa40e4899ad1d74d5ed3c926acfda54f2 (diff) | |
| parent | 7bf9bca7c0a9fe5c63e8fd5c2aa63884d76dace0 (diff) | |
Merge tag 'u-boot-atmel-2019.07-a' of git://git.denx.de/u-boot-atmel
First set of u-boot-atmel features and fixes for 2019.07 cycle
Diffstat (limited to 'include/watchdog.h')
| -rw-r--r-- | include/watchdog.h | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/include/watchdog.h b/include/watchdog.h index 14073cfdd2..3a357de903 100644 --- 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 /* |