diff options
| author | Tom Rini <trini@konsulko.com> | 2022-06-07 08:17:24 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2022-06-07 08:17:24 -0400 |
| commit | 6530de23e946dcdefc99f0eef256db768e4bbdf1 (patch) | |
| tree | a0bf0902a1adea8edd10e0523d48478d2a6b1d24 | |
| parent | d9ad48464c2c017bdaa2059f2f578e7b8d4401b3 (diff) | |
| parent | 06ceff70bf040536163d5010c7560e5846f063c6 (diff) | |
| download | u-boot-WIP/07Jun2022.zip u-boot-WIP/07Jun2022.tar.gz u-boot-WIP/07Jun2022.tar.bz2 | |
Merge https://source.denx.de/u-boot/custodians/u-boot-watchdogWIP/07Jun2022
- Fix SPL build with watchdog disabled in asm files (Pali)
| -rw-r--r-- | include/watchdog.h | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/include/watchdog.h b/include/watchdog.h index 14fa5fd..813cc8f 100644 --- a/include/watchdog.h +++ b/include/watchdog.h @@ -49,7 +49,13 @@ 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) && \ |