diff options
| author | Wolfgang Denk <wd@denx.de> | 2009-02-01 21:31:37 +0100 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2009-02-01 21:31:37 +0100 |
| commit | ee924e00300bd1136589b2d5f8ad1f008df01bd4 (patch) | |
| tree | 4f517ecc2faf55dbaa3145835eef2eac2e0a4033 /cpu/mpc8260/Makefile | |
| parent | f4b6f45dcba989f5a900edc07ececae80c79abdf (diff) | |
| parent | fc01ea1e27d5b124f0a1868d0ce569f156d58dfe (diff) | |
| download | u-boot-imx-ee924e00300bd1136589b2d5f8ad1f008df01bd4.zip u-boot-imx-ee924e00300bd1136589b2d5f8ad1f008df01bd4.tar.gz u-boot-imx-ee924e00300bd1136589b2d5f8ad1f008df01bd4.tar.bz2 | |
Merge branch 'master' of git://git.denx.de/u-boot-net
Diffstat (limited to 'cpu/mpc8260/Makefile')
| -rw-r--r-- | cpu/mpc8260/Makefile | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/cpu/mpc8260/Makefile b/cpu/mpc8260/Makefile index 80d7852..9f0c2dd 100644 --- a/cpu/mpc8260/Makefile +++ b/cpu/mpc8260/Makefile @@ -1,5 +1,5 @@ # -# (C) Copyright 2000-2006 +# (C) Copyright 2000-2008 # Wolfgang Denk, DENX Software Engineering, wd@denx.de. # # See file CREDITS for list of people who contributed to this @@ -27,9 +27,13 @@ LIB = $(obj)lib$(CPU).a START = start.o kgdb.o COBJS = traps.o serial_smc.o serial_scc.o cpu.o cpu_init.o speed.o \ - interrupts.o ether_scc.o ether_fcc.o i2c.o commproc.o \ + interrupts.o ether_fcc.o i2c.o commproc.o \ bedbug_603e.o pci.o spi.o +COBJS-$(CONFIG_ETHER_ON_SCC) = ether_scc.o + +COBJS += $(COBJS-y) + SRCS := $(START:.o=.S) $(SOBJS:.o=.S) $(COBJS:.o=.c) OBJS := $(addprefix $(obj),$(SOBJS) $(COBJS)) START := $(addprefix $(obj),$(START)) |