diff options
author | Stefan Roese <sr@denx.de> | 2007-12-27 19:37:26 +0100 |
---|---|---|
committer | Stefan Roese <sr@denx.de> | 2007-12-27 19:37:26 +0100 |
commit | bb701283a8dcb2521000fe437f19a83cadc98b02 (patch) | |
tree | c8fe6881bf3b607b18b098009a64650357e848f5 /cpu/mpc85xx/Makefile | |
parent | b568fd25574181a3b12ae3d66b2913903442cb83 (diff) | |
parent | 0dcfe3a225a9436fc514f374a19242c672f1172b (diff) | |
download | u-boot-imx-bb701283a8dcb2521000fe437f19a83cadc98b02.zip u-boot-imx-bb701283a8dcb2521000fe437f19a83cadc98b02.tar.gz u-boot-imx-bb701283a8dcb2521000fe437f19a83cadc98b02.tar.bz2 |
Merge branch 'master' of /home/stefan/git/u-boot/u-boot into for-1.3.2-ver2
Diffstat (limited to 'cpu/mpc85xx/Makefile')
-rw-r--r-- | cpu/mpc85xx/Makefile | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/cpu/mpc85xx/Makefile b/cpu/mpc85xx/Makefile index 32091fa..d179d70 100644 --- a/cpu/mpc85xx/Makefile +++ b/cpu/mpc85xx/Makefile @@ -29,8 +29,10 @@ include $(TOPDIR)/config.mk LIB = $(obj)lib$(CPU).a START = start.o resetvec.o +COBJS-$(CONFIG_OF_LIBFDT) += fdt.o COBJS = traps.o cpu.o cpu_init.o speed.o interrupts.o \ - pci.o serial_scc.o commproc.o ether_fcc.o spd_sdram.o qe_io.o + pci.o serial_scc.o commproc.o ether_fcc.o spd_sdram.o qe_io.o \ + $(COBJS-y) SRCS := $(START:.o=.S) $(SOBJS:.o=.S) $(COBJS:.o=.c) OBJS := $(addprefix $(obj),$(SOBJS) $(COBJS)) |