diff options
| -rw-r--r-- | cpu/ixp/Makefile | 14 | ||||
| -rw-r--r-- | cpu/ixp/pci.c | 4 | ||||
| -rw-r--r-- | cpu/ixp/timer.c | 2 |
3 files changed, 10 insertions, 10 deletions
diff --git a/cpu/ixp/Makefile b/cpu/ixp/Makefile index e1fb327bb4..afa972a919 100644 --- a/cpu/ixp/Makefile +++ b/cpu/ixp/Makefile @@ -26,10 +26,16 @@ 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 +COBJS-$(CONFIG_PCI) += pci.o +COBJS-y += serial.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) diff --git a/cpu/ixp/pci.c b/cpu/ixp/pci.c index 8c6b0b21b4..aae3d3d2c1 100644 --- a/cpu/ixp/pci.c +++ b/cpu/ixp/pci.c @@ -24,9 +24,6 @@ #include <common.h> - -#ifdef CONFIG_PCI - #include <asm/processor.h> #include <asm/io.h> #include <pci.h> @@ -572,4 +569,3 @@ pci_dev_t pci_find_devices (struct pci_device_id * ids, int devNo) } return -1; } -#endif /* CONFIG_PCI */ diff --git a/cpu/ixp/timer.c b/cpu/ixp/timer.c index 09d8ad5602..deb227a1a6 100644 --- a/cpu/ixp/timer.c +++ b/cpu/ixp/timer.c @@ -32,7 +32,6 @@ #include <common.h> #include <asm/arch/ixp425.h> -#ifndef CONFIG_USE_IRQ ulong get_timer (ulong base) { return get_timer_masked () - base; @@ -80,4 +79,3 @@ ulong get_timer_masked (void) } return (reload_constant - current); } -#endif /* #ifndef CONFIG_USE_IRQ */ |
