random-mirrors/smaeul-u-boot
1
0
Fork 0
mirror of https://github.com/smaeul/u-boot.git synced 2025-10-13 20:36:02 +01:00
Code Issues Packages Projects Releases Wiki Activity

powerpc: mpc85xx: Fix compilation with CONFIG_WDT

Browse Source 
When CONFIG_WDT is enabled then non-DM watchdog code cannot be used due to
conflicting functions like watchdog_reset(). So disable compilation of
mpc85xx watchdog_reset() function when CONFIG_WDT is enabled.

Signed-off-by: Pali Rohár <pali@kernel.org>
This commit is contained in:
Pali Rohár 2022-04-28 13:31:43 +02:00 committed by Peng Fan
parent 26f6f7188b
commit 549bb6b237
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
arch/powerpc/cpu/mpc85xx/cpu.c
View File

@ -344,6 +344,7 @@ __weak unsigned long get_tbclk(void)
}
#ifndef CONFIG_WDT
#if defined(CONFIG_WATCHDOG)
#define WATCHDOG_MASK (TCR_WP(63) | TCR_WRC(3) | TCR_WIE)
void
@ -372,6 +373,7 @@ watchdog_reset(void)
enable_interrupts();
}
#endif /* CONFIG_WATCHDOG */
#endif
/*
* Initializes on-chip MMC controllers.