summaryrefslogtreecommitdiff
path: root/cpu/mpc8220
diff options
context:
space:
mode:
authorWolfgang Denk <wd@pollux.denx.de>2006-09-04 01:03:57 +0200
committerWolfgang Denk <wd@pollux.denx.de>2006-09-04 01:03:57 +0200
commit6741ae92f37caea8a22d1dcfaeab356f94b64676 (patch)
tree8abb7ed1b67b2b75733e02a923a229ed8176863f /cpu/mpc8220
parent360b4103677b27ad4018174a1d186218969d83a1 (diff)
parentf93286397ed2a7084efb0362a43ee09f11702349 (diff)
Merge with /home/m8/git/u-boot
Diffstat (limited to 'cpu/mpc8220')
-rw-r--r--cpu/mpc8220/Makefile22
1 files changed, 13 insertions, 9 deletions
diff --git a/cpu/mpc8220/Makefile b/cpu/mpc8220/Makefile
index 7c9b6c990f..1f2e93176f 100644
--- a/cpu/mpc8220/Makefile
+++ b/cpu/mpc8220/Makefile
@@ -1,5 +1,5 @@
#
-# (C) Copyright 2003
+# (C) Copyright 2003-2006
# Wolfgang Denk, DENX Software Engineering, wd@denx.de.
#
# See file CREDITS for list of people who contributed to this
@@ -23,24 +23,28 @@
include $(TOPDIR)/config.mk
-LIB = lib$(CPU).a
+LIB = $(obj)lib$(CPU).a
START = start.o
-ASOBJS = io.o fec_dma_tasks.o
-OBJS = cpu.o cpu_init.o dramSetup.o fec.o i2c.o \
+SOBJS = io.o fec_dma_tasks.o
+COBJS = cpu.o cpu_init.o dramSetup.o fec.o i2c.o \
interrupts.o loadtask.o speed.o \
traps.o uart.o pci.o
-all: .depend $(START) $(ASOBJS) $(LIB)
+SRCS := $(START:.o=.S) $(SOBJS:.o=.S) $(COBJS:.o=.c)
+OBJS := $(addprefix $(obj),$(SOBJS) $(COBJS))
+START := $(addprefix $(obj),$(START))
+
+all: $(obj).depend $(START) $(LIB)
$(LIB): $(OBJS)
- $(AR) crv $@ $(ASOBJS) $(OBJS)
+ $(AR) crv $@ $(OBJS)
#########################################################################
-.depend: Makefile $(START:.o=.S) $(OBJS:.o=.c)
- $(CC) -M $(CFLAGS) $(START:.o=.S) $(ASOBJS:.o=.S) $(OBJS:.o=.c) > $@
+# defines $(obj).depend target
+include $(SRCTREE)/rules.mk
-sinclude .depend
+sinclude $(obj).depend
#########################################################################