summaryrefslogtreecommitdiff
path: root/cpu/mpc8260/Makefile
diff options
context:
space:
mode:
authorGary Jennejohn <garyj@denx.de>2008-11-20 12:28:38 +0100
committerBen Warren <biggerbadderben@gmail.com>2009-01-24 20:45:52 -0800
commitba705b5b1a97b47388ed48858bef6bf7b6bfcd56 (patch)
tree738172fe3d7ef84169c16e0be268c259278bceda /cpu/mpc8260/Makefile
parentbd3980cc095af1728b994cdd8bf1ac430b6289e6 (diff)
downloadu-boot-imx-ba705b5b1a97b47388ed48858bef6bf7b6bfcd56.zip
u-boot-imx-ba705b5b1a97b47388ed48858bef6bf7b6bfcd56.tar.gz
u-boot-imx-ba705b5b1a97b47388ed48858bef6bf7b6bfcd56.tar.bz2
mgcoge make ether_scc.c work with CONFIG_NET_MULTI
This change is needed for mgcoge because it uses two ethernet drivers. Add a check for the presence of the PIGGY board on mgcoge. Without this board networking cannot work and the initialization must be aborted. Only allocate rtx once to prevent DPRAM exhaustion. Initialize ether_scc.c and the keymile-specific HDLC driver (to be added soon) in eth.c. Signed-off-by: Gary Jennejohn <garyj@denx.de> Signed-off-by: Ben Warren <biggerbadderben@gmail.com>
Diffstat (limited to 'cpu/mpc8260/Makefile')
-rw-r--r--cpu/mpc8260/Makefile8
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))