diff options
| author | Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com> | 2009-05-15 23:45:22 +0200 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2009-06-12 20:39:48 +0200 |
| commit | 2c75c78d94574ee996db2aa9b511258519471dd6 (patch) | |
| tree | 3e9bc34ec12ad3325aaf2d6bd348064d59dacec5 | |
| parent | 8fc3bb4b0603516ad641e2de252a400b85fd869b (diff) | |
| download | u-boot-2c75c78d94574ee996db2aa9b511258519471dd6.tar.gz u-boot-2c75c78d94574ee996db2aa9b511258519471dd6.tar.xz u-boot-2c75c78d94574ee996db2aa9b511258519471dd6.zip | |
ixp/interrupts: Move conditional compilation to Makefile
Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
| -rw-r--r-- | cpu/ixp/Makefile | 3 | ||||
| -rw-r--r-- | cpu/ixp/interrupts.c | 8 |
2 files changed, 2 insertions, 9 deletions
diff --git a/cpu/ixp/Makefile b/cpu/ixp/Makefile index 7e98d87026..a673cb1b9f 100644 --- a/cpu/ixp/Makefile +++ b/cpu/ixp/Makefile @@ -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) diff --git a/cpu/ixp/interrupts.c b/cpu/ixp/interrupts.c index 621f31b00f..ee0129ead3 100644 --- a/cpu/ixp/interrupts.c +++ b/cpu/ixp/interrupts.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); } |