diff options
| author | Pali Rohár <[email protected]> | 2022-04-28 13:31:43 +0200 |
|---|---|---|
| committer | Peng Fan <[email protected]> | 2022-06-20 09:18:26 +0800 |
| commit | 549bb6b2376b81f30b9492afeff5d6cdf7523eeb (patch) | |
| tree | 87ef5b243f5ea2fb16553d4f2ef87a58a51ee20c | |
| parent | 26f6f7188bf03dbf9499ef626253cf3b2c1bd3de (diff) | |
powerpc: mpc85xx: Fix compilation with CONFIG_WDT
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 <[email protected]>
| -rw-r--r-- | arch/powerpc/cpu/mpc85xx/cpu.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/powerpc/cpu/mpc85xx/cpu.c b/arch/powerpc/cpu/mpc85xx/cpu.c index a82516a75bd..ba9736ebef4 100644 --- a/arch/powerpc/cpu/mpc85xx/cpu.c +++ b/arch/powerpc/cpu/mpc85xx/cpu.c @@ -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. |