diff options
| author | roy zang <tie-fei.zang@freescale.com> | 2006-12-01 12:09:33 +0800 |
|---|---|---|
| committer | Zang Tiefei <roy@bus.ap.freescale.net> | 2006-12-01 12:09:33 +0800 |
| commit | e0b369e4f71b11dd5716903dd6258028cf07e6e8 (patch) | |
| tree | 615986f2b3088072c49d74e1086650e185087698 /cpu/mpc83xx/Makefile | |
| parent | ee311214e0d216f904feea269599d0934bf71f23 (diff) | |
| parent | dd520bf314c7add4183c5191692180f576f96b60 (diff) | |
Fix the confilcts when merging 'master' into hpc2.
The conflicts due to a new mpc7448 p3m7448 board is in the main tree.
Merge branch 'master' into hpc2
Conflicts:
MAKEALL
cpu/74xx_7xx/cpu.c
cpu/74xx_7xx/cpu_init.c
cpu/74xx_7xx/speed.c
Diffstat (limited to 'cpu/mpc83xx/Makefile')
| -rw-r--r-- | cpu/mpc83xx/Makefile | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/cpu/mpc83xx/Makefile b/cpu/mpc83xx/Makefile index b2a6b3e9c5..4b9dcc8180 100644 --- a/cpu/mpc83xx/Makefile +++ b/cpu/mpc83xx/Makefile @@ -27,9 +27,9 @@ include $(TOPDIR)/config.mk LIB = $(obj)lib$(CPU).a -START = start.o resetvec.o +START = start.o COBJS = traps.o cpu.o cpu_init.o speed.o interrupts.o \ - i2c.o spd_sdram.o + spd_sdram.o qe_io.o SRCS := $(START:.o=.S) $(SOBJS:.o=.S) $(COBJS:.o=.c) OBJS := $(addprefix $(obj),$(SOBJS) $(COBJS)) |