LM
/
u-boot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ixp/interrupts: Move conditional compilation to Makefile 

Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
This commit is contained in:
Jean-Christophe PLAGNIOL-VILLARD 2009-05-15 23:45:22 +02:00 committed by Wolfgang Denk
parent 8fc3bb4b06
commit 2c75c78d94
2 changed files with 2 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
cpu/ixp/Makefile
View File

@ -27,9 +27,10 @@ LIB = $(obj)lib$(CPU).a
START = start.o START = start.o
COBJS-y += cpu.o COBJS-y += cpu.o
COBJS-y += interrupts.o
ifndef CONFIG_USE_IRQ ifndef CONFIG_USE_IRQ
COBJS-y += timer.o COBJS-y += timer.o
else
COBJS-y += interrupts.o
endif endif
SRCS := $(START:.o=.S) $(SOBJS-y:.o=.S) $(COBJS-y:.o=.c) SRCS := $(START:.o=.S) $(SOBJS-y:.o=.S) $(COBJS-y:.o=.c)

8
cpu/ixp/interrupts.c
View File

@ -31,8 +31,6 @@
#include <common.h> #include <common.h>
#include <asm/arch/ixp425.h> #include <asm/arch/ixp425.h>
#ifdef CONFIG_USE_IRQ
#include <asm/proc-armv/ptrace.h> #include <asm/proc-armv/ptrace.h>
/* /*
@ -85,20 +83,15 @@ void reset_timer (void)
timestamp = 0; timestamp = 0;
} }
#endif /* #ifdef CONFIG_USE_IRQ */
#ifdef CONFIG_USE_IRQ
void do_irq (struct pt_regs *pt_regs) void do_irq (struct pt_regs *pt_regs)
{ {
int irq = next_irq(); int irq = next_irq();
IRQ_HANDLER[irq].m_func(IRQ_HANDLER[irq].m_data); IRQ_HANDLER[irq].m_func(IRQ_HANDLER[irq].m_data);
} }
#endif
int interrupt_init (void) int interrupt_init (void)
{ {
#ifdef CONFIG_USE_IRQ
int i; int i;
/* install default interrupt handlers */ /* install default interrupt handlers */
@ -119,7 +112,6 @@ int interrupt_init (void)
/* enable timer irq */ /* enable timer irq */
*IXP425_ICMR = (1 << IXP425_TIMER_2_IRQ); *IXP425_ICMR = (1 << IXP425_TIMER_2_IRQ);
#endif
return (0); return (0);
} }