Merge branch 'master' of git://git.denx.de/u-boot-net

[oweals/u-boot.git] / cpu / ixp / Makefile

diff --git a/cpu/ixp/Makefile b/cpu/ixp/Makefile
index e1fb327bb4b938772dd85dec82173015d70098b2..7e98d870261918f866c2e57306fc8f95689e1d8b 100644 (file)
--- a/cpu/ixp/Makefile
+++ b/cpu/ixp/Makefile
@@ -26,10 +26,14 @@ include $(TOPDIR)/config.mk
 LIB    = $(obj)lib$(CPU).a
 
 START  = start.o
-COBJS  = serial.o interrupts.o cpu.o timer.o pci.o
-
-SRCS   := $(START:.o=.S) $(SOBJS:.o=.S) $(COBJS:.o=.c)
-OBJS   := $(addprefix $(obj),$(SOBJS) $(COBJS))
+COBJS-y        += cpu.o
+COBJS-y        += interrupts.o
+ifndef CONFIG_USE_IRQ
+COBJS-y        += timer.o
+endif
+
+SRCS   := $(START:.o=.S) $(SOBJS-y:.o=.S) $(COBJS-y:.o=.c)
+OBJS   := $(addprefix $(obj),$(SOBJS-y) $(COBJS-y))
 START  := $(addprefix $(obj),$(START))
 
 all:   $(obj).depend $(START) $(LIB)