summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBen Warren <biggerbadderben@gmail.com>2008-08-28 23:58:30 -0700
committerJohn Rigby <jrigby@freescale.com>2008-08-29 13:58:12 -0600
commit6b5049d056cd8ef72d1f2f461ceb2d033d93f759 (patch)
treecca45e6f4a3f1bf1127860214b8db0922d1f6962
parent80b00af01b3c9154774de2936f05a051e92f6a03 (diff)
Move MPC512x_FEC driver to drivers/net
Signed-off-by: Ben Warren <biggerbadderben@gmail.com>
-rw-r--r--cpu/mpc512x/Makefile2
-rw-r--r--drivers/net/Makefile1
-rw-r--r--drivers/net/mpc512x_fec.c (renamed from cpu/mpc512x/fec.c)2
-rw-r--r--drivers/net/mpc512x_fec.h (renamed from cpu/mpc512x/fec.h)0
4 files changed, 3 insertions, 2 deletions
diff --git a/cpu/mpc512x/Makefile b/cpu/mpc512x/Makefile
index 8ba8ae875..e8f106074 100644
--- a/cpu/mpc512x/Makefile
+++ b/cpu/mpc512x/Makefile
@@ -25,7 +25,7 @@ include $(TOPDIR)/config.mk
LIB = $(obj)lib$(CPU).a
START = start.o
-COBJS = traps.o cpu.o cpu_init.o speed.o interrupts.o serial.o fec.o i2c.o iopin.o
+COBJS = traps.o cpu.o cpu_init.o speed.o interrupts.o serial.o i2c.o iopin.o
SRCS := $(START:.o=.S) $(SOBJS:.o=.S) $(COBJS:.o=.c)
OBJS := $(addprefix $(obj),$(SOBJS) $(COBJS))
diff --git a/drivers/net/Makefile b/drivers/net/Makefile
index c68d3e7a2..a084000a9 100644
--- a/drivers/net/Makefile
+++ b/drivers/net/Makefile
@@ -42,6 +42,7 @@ COBJS-$(CONFIG_DRIVER_LAN91C96) += lan91c96.o
COBJS-$(CONFIG_MACB) += macb.o
COBJS-$(CONFIG_MCFFEC) += mcffec.o
COBJS-$(CONFIG_MPC5xxx_FEC) += mpc5xxx_fec.o
+COBJS-$(CONFIG_MPC512x_FEC) += mpc512x_fec.o
COBJS-$(CONFIG_NATSEMI) += natsemi.o
ifeq ($(CONFIG_DRIVER_NE2000),y)
COBJS-y += ne2000.o
diff --git a/cpu/mpc512x/fec.c b/drivers/net/mpc512x_fec.c
index e9df7de5e..7caeeda65 100644
--- a/cpu/mpc512x/fec.c
+++ b/drivers/net/mpc512x_fec.c
@@ -11,7 +11,7 @@
#include <malloc.h>
#include <net.h>
#include <miiphy.h>
-#include "fec.h"
+#include "mpc512x_fec.h"
DECLARE_GLOBAL_DATA_PTR;
diff --git a/cpu/mpc512x/fec.h b/drivers/net/mpc512x_fec.h
index 9c3850287..9c3850287 100644
--- a/cpu/mpc512x/fec.h
+++ b/drivers/net/mpc512x_fec.h