projects
/
oweals
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of git://www.denx.de/git/u-boot-arm
[oweals/u-boot.git]
/
cpu
/
arm920t
/
interrupts.c
diff --git
a/cpu/arm920t/interrupts.c
b/cpu/arm920t/interrupts.c
index ea58f154d40f3069c7cd1c98234a9ecb0f134e50..a43a3ed4fe91d0932b60b944eb492f7d5a648de0 100644
(file)
--- a/
cpu/arm920t/interrupts.c
+++ b/
cpu/arm920t/interrupts.c
@@
-30,12
+30,9
@@
*/
#include <common.h>
*/
#include <common.h>
-
#include <arm920t.h>
#include <asm/proc-armv/ptrace.h>
#include <arm920t.h>
#include <asm/proc-armv/ptrace.h>
-extern void reset_cpu(ulong addr);
-
#ifdef CONFIG_USE_IRQ
/* enable IRQ interrupts */
void enable_interrupts (void)
#ifdef CONFIG_USE_IRQ
/* enable IRQ interrupts */
void enable_interrupts (void)
@@
-164,7
+161,14
@@
void do_fiq (struct pt_regs *pt_regs)
void do_irq (struct pt_regs *pt_regs)
{
void do_irq (struct pt_regs *pt_regs)
{
+#if defined (CONFIG_USE_IRQ) && defined (CONFIG_ARCH_INTEGRATOR)
+ /* ASSUMED to be a timer interrupt */
+ /* Just clear it - count handled in */
+ /* integratorap.c */
+ *(volatile ulong *)(CFG_TIMERBASE + 0x0C) = 0;
+#else
printf ("interrupt request\n");
show_regs (pt_regs);
bad_mode ();
printf ("interrupt request\n");
show_regs (pt_regs);
bad_mode ();
+#endif
}
}