mirrors/u-boot
1
0
Fork 0
mirror of https://source.denx.de/u-boot/u-boot.git synced 2025-09-02 20:41:38 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge https://source.denx.de/u-boot/custodians/u-boot-watchdog

Browse Source 
- Fix SPL build with watchdog disabled in asm files (Pali)
This commit is contained in:
Tom Rini 2022-06-07 08:17:24 -04:00
commit 6530de23e9
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
include/watchdog.h
View File

@ -49,7 +49,13 @@ int init_func_watchdog_reset(void);
*/ */
#if defined(CONFIG_WATCHDOG) #if defined(CONFIG_WATCHDOG)
#if defined(__ASSEMBLY__) #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 #else
/* Don't require the watchdog to be enabled in SPL */ /* Don't require the watchdog to be enabled in SPL */
#if defined(CONFIG_SPL_BUILD) && \ #if defined(CONFIG_SPL_BUILD) && \