Move MPC5xxx_FEC driver to drivers/net

Signed-off-by: Ben Warren <biggerbadderben@gmail.com>

diff --git a/cpu/mpc5xxx/Makefile b/cpu/mpc5xxx/Makefile
index 312b0bfc6cc8a64c3dbc5a3d37fe4b2052fb3d32..06fdbcfb7292b6c0149fb36ac8513ace7c25acc9 100644 (file)
--- a/cpu/mpc5xxx/Makefile
+++ b/cpu/mpc5xxx/Makefile
@@ -27,7 +27,7 @@ LIB   = $(obj)lib$(CPU).a
 
 START  = start.o
 SOBJS  = io.o firmware_sc_task_bestcomm.impl.o firmware_sc_task.impl.o
-COBJS  = i2c.o traps.o cpu.o cpu_init.o fec.o ide.o interrupts.o \
+COBJS  = i2c.o traps.o cpu.o cpu_init.o ide.o interrupts.o \
          loadtask.o pci_mpc5200.o serial.o speed.o usb_ohci.o usb.o
 
 SRCS   := $(START:.o=.S) $(SOBJS:.o=.S) $(COBJS:.o=.c)

diff --git a/drivers/net/Makefile b/drivers/net/Makefile
index bcf31cbe278a41fc6e95c380e967a6eeace4370d..c68d3e7a2008161f9a79da0cbb8d908649ada38b 100644 (file)
--- a/drivers/net/Makefile
+++ b/drivers/net/Makefile
@@ -41,6 +41,7 @@ COBJS-$(CONFIG_DRIVER_KS8695ETH) += ks8695eth.o
 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_NATSEMI) += natsemi.o
 ifeq ($(CONFIG_DRIVER_NE2000),y)
 COBJS-y += ne2000.o

diff --git a/cpu/mpc5xxx/fec.c b/drivers/net/mpc5xxx_fec.c
similarity index 99%
rename from cpu/mpc5xxx/fec.c
rename to drivers/net/mpc5xxx_fec.c
index bf804ee595e53e5829fb979aeeedc9aae9bb23a8..3d3eb8bae83dc22deb1f41257e98cb314ff3c214 100644 (file)
--- a/cpu/mpc5xxx/fec.c
+++ b/drivers/net/mpc5xxx_fec.c
@@ -8,11 +8,11 @@
 
 #include <common.h>
 #include <mpc5xxx.h>
+#include <mpc5xxx_sdma.h>
 #include <malloc.h>
 #include <net.h>
 #include <miiphy.h>
-#include "sdma.h"
-#include "fec.h"
+#include "mpc5xxx_fec.h"
 
 DECLARE_GLOBAL_DATA_PTR;
 

diff --git a/cpu/mpc5xxx/fec.h b/drivers/net/mpc5xxx_fec.h
similarity index 99%
rename from cpu/mpc5xxx/fec.h
rename to drivers/net/mpc5xxx_fec.h
index 81756a5f6accac59a5c3e90b5d8c6a7f152a1e6c..16c3e8e9186cfb5e76d64a04ee8c05518105e58d 100644 (file)
--- a/cpu/mpc5xxx/fec.h
+++ b/drivers/net/mpc5xxx_fec.h
@@ -11,10 +11,6 @@
 #ifndef __MPC5XXX_FEC_H
 #define __MPC5XXX_FEC_H
 
-#include <common.h>
-#include <mpc5xxx.h>
-#include "sdma.h"
-
 typedef unsigned long uint32;
 typedef unsigned short uint16;
 typedef unsigned char uint8;

diff --git a/cpu/mpc5xxx/sdma.h b/include/mpc5xxx_sdma.h
similarity index 100%
rename from cpu/mpc5xxx/sdma.h
rename to include/mpc5xxx_sdma.h