brain-hackers_pepepper-mirror/u-boot-brain
1
0
Fork 0
mirror of https://github.com/brain-hackers/u-boot-brain synced 2024-07-09 12:46:17 +09:00
Code Issues Projects Releases Wiki Activity

ixp: Move conditional compilation to Makefile

Browse Source 
Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
This commit is contained in:
Jean-Christophe PLAGNIOL-VILLARD 2009-01-31 08:53:44 +01:00
parent f693f501d6
commit 012d5bab09
3 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
cpu/ixp/Makefile
View File

@ -26,10 +26,16 @@ include $(TOPDIR)/config.mk
LIB = $(obj)lib$(CPU).a LIB = $(obj)lib$(CPU).a
START = start.o START = start.o
COBJS = serial.o interrupts.o cpu.o timer.o pci.o 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:.o=.S) $(COBJS:.o=.c) SRCS := $(START:.o=.S) $(SOBJS-y:.o=.S) $(COBJS-y:.o=.c)
OBJS := $(addprefix $(obj),$(SOBJS) $(COBJS)) OBJS := $(addprefix $(obj),$(SOBJS-y) $(COBJS-y))
START := $(addprefix $(obj),$(START)) START := $(addprefix $(obj),$(START))
all: $(obj).depend $(START) $(LIB) all: $(obj).depend $(START) $(LIB)

4
cpu/ixp/pci.c
View File

@ -24,9 +24,6 @@
#include <common.h> #include <common.h>
#ifdef CONFIG_PCI
#include <asm/processor.h> #include <asm/processor.h>
#include <asm/io.h> #include <asm/io.h>
#include <pci.h> #include <pci.h>
@ -572,4 +569,3 @@ pci_dev_t pci_find_devices (struct pci_device_id * ids, int devNo)
} }
return -1; return -1;
} }
#endif /* CONFIG_PCI */

2
cpu/ixp/timer.c
View File

@ -32,7 +32,6 @@
#include <common.h> #include <common.h>
#include <asm/arch/ixp425.h> #include <asm/arch/ixp425.h>
#ifndef CONFIG_USE_IRQ
ulong get_timer (ulong base) ulong get_timer (ulong base)
{ {
return get_timer_masked () - base; return get_timer_masked () - base;
@ -80,4 +79,3 @@ ulong get_timer_masked (void)
} }
return (reload_constant - current); return (reload_constant - current);
} }
#endif /* #ifndef CONFIG_USE_IRQ */