leandrof/u-boot
1
0
Fork 1
Code Issues Pull Requests Packages Projects Releases Wiki Activity

watchdog: Fix SPL build with watchdog disabled in asm files

Browse Source 
Allow to compile assembler files in SPL build which calls WATCHDOG_RESET
function when watchdog is disabled in SPL and enabled in U-Boot proper.

This issue was fixed in past by commit 7fbd42f5af ("watchdog: Handle SPL
build with watchdog disabled") for C source files, but not for assembler
source files.

Currently the only assembler source file which calls WATCHDOG_RESET is
arch/powerpc/lib/ticks.S, so this patch affects and fixes powerpc SPL
builds.

Signed-off-by: Pali Rohár <pali@kernel.org>
Reviewed-by: Stefan Roese <sr@denx.de>
This commit is contained in:
Pali Rohár
2022-04-28 13:33:09 +02:00
committed by Stefan Roese
parent 8f527342db
commit 06ceff70bf
1 changed files with 7 additions and 1 deletions
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) && \