Commit 2c75c78d authored by Jean-Christophe PLAGNIOL-VILLARD's avatar Jean-Christophe PLAGNIOL-VILLARD Committed by Wolfgang Denk

ixp/interrupts: Move conditional compilation to Makefile

Signed-off-by: default avatarJean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
parent 8fc3bb4b
......@@ -27,9 +27,10 @@ LIB = $(obj)lib$(CPU).a
START = start.o
COBJS-y += cpu.o
COBJS-y += interrupts.o
ifndef CONFIG_USE_IRQ
COBJS-y += timer.o
else
COBJS-y += interrupts.o
endif
SRCS := $(START:.o=.S) $(SOBJS-y:.o=.S) $(COBJS-y:.o=.c)
......
......@@ -31,8 +31,6 @@
#include <common.h>
#include <asm/arch/ixp425.h>
#ifdef CONFIG_USE_IRQ
#include <asm/proc-armv/ptrace.h>
/*
......@@ -85,20 +83,15 @@ void reset_timer (void)
timestamp = 0;
}
#endif /* #ifdef CONFIG_USE_IRQ */
#ifdef CONFIG_USE_IRQ
void do_irq (struct pt_regs *pt_regs)
{
int irq = next_irq();
IRQ_HANDLER[irq].m_func(IRQ_HANDLER[irq].m_data);
}
#endif
int interrupt_init (void)
{
#ifdef CONFIG_USE_IRQ
int i;
/* install default interrupt handlers */
......@@ -119,7 +112,6 @@ int interrupt_init (void)
/* enable timer irq */
*IXP425_ICMR = (1 << IXP425_TIMER_2_IRQ);
#endif
return (0);
}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment