diff options
| author | Tom Rini <trini@konsulko.com> | 2018-09-18 20:42:37 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2018-09-18 20:42:37 -0400 |
| commit | 4e710ebb4463c8e031eb269c012fbadb2479608b (patch) | |
| tree | f334518436bc0262b483308026fbba413a45493e /arch/powerpc/lib/interrupts.c | |
| parent | b57f1895b669e3fbdca486e7c40dfea00f22bb93 (diff) | |
| parent | 75629a25087cd9897305375421abe2248bc40e72 (diff) | |
Merge git://git.denx.de/u-boot-dm
- MPC83xx device tree additions (CPU and RAM)
- Fix sandbox build error
- Sync bitrev with Linux
- Various ofnode/DT improvements
Diffstat (limited to 'arch/powerpc/lib/interrupts.c')
| -rw-r--r-- | arch/powerpc/lib/interrupts.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/arch/powerpc/lib/interrupts.c b/arch/powerpc/lib/interrupts.c index f63e5cf799b..19682cfcfad 100644 --- a/arch/powerpc/lib/interrupts.c +++ b/arch/powerpc/lib/interrupts.c @@ -14,6 +14,7 @@ #include <status_led.h> #endif +#ifndef CONFIG_MPC83XX_TIMER #ifdef CONFIG_SHOW_ACTIVITY void board_show_activity (ulong) __attribute__((weak, alias("__board_show_activity"))); @@ -44,7 +45,7 @@ static __inline__ void set_dec (unsigned long val) if (val) asm volatile ("mtdec %0"::"r" (val)); } - +#endif /* !CONFIG_MPC83XX_TIMER */ void enable_interrupts (void) { @@ -60,6 +61,7 @@ int disable_interrupts (void) return ((msr & MSR_EE) != 0); } +#ifndef CONFIG_MPC83XX_TIMER int interrupt_init (void) { /* call cpu specific function from $(CPU)/interrupts.c */ @@ -102,3 +104,4 @@ ulong get_timer (ulong base) { return (timestamp - base); } +#endif /* !CONFIG_MPC83XX_TIMER */ |