mirror of
https://github.com/smaeul/u-boot.git
synced 2025-10-14 04:46:01 +01:00
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 <pali@kernel.org>
This commit is contained in:
parent
26f6f7188b
commit
549bb6b237
@ -344,6 +344,7 @@ __weak unsigned long get_tbclk(void)
|
|||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
#ifndef CONFIG_WDT
|
||||||
#if defined(CONFIG_WATCHDOG)
|
#if defined(CONFIG_WATCHDOG)
|
||||||
#define WATCHDOG_MASK (TCR_WP(63) | TCR_WRC(3) | TCR_WIE)
|
#define WATCHDOG_MASK (TCR_WP(63) | TCR_WRC(3) | TCR_WIE)
|
||||||
void
|
void
|
||||||
@ -372,6 +373,7 @@ watchdog_reset(void)
|
|||||||
enable_interrupts();
|
enable_interrupts();
|
||||||
}
|
}
|
||||||
#endif /* CONFIG_WATCHDOG */
|
#endif /* CONFIG_WATCHDOG */
|
||||||
|
#endif
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Initializes on-chip MMC controllers.
|
* Initializes on-chip MMC controllers.
|
||||||
|
Loading…
x
Reference in New Issue
Block a user