summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBen Warren <biggerbadderben@gmail.com>2008-08-28 23:58:29 -0700
committerJohn Rigby <jrigby@freescale.com>2008-08-29 13:58:07 -0600
commit80b00af01b3c9154774de2936f05a051e92f6a03 (patch)
tree6fe630739a116a631e371585a22d976170b40cf7
parent8a490422bed685c9491274ec997f62061d88620b (diff)
downloadu-boot-imx-80b00af01b3c9154774de2936f05a051e92f6a03.zip
u-boot-imx-80b00af01b3c9154774de2936f05a051e92f6a03.tar.gz
u-boot-imx-80b00af01b3c9154774de2936f05a051e92f6a03.tar.bz2
Move MPC5xxx_FEC driver to drivers/net
Signed-off-by: Ben Warren <biggerbadderben@gmail.com>
-rw-r--r--cpu/mpc5xxx/Makefile2
-rw-r--r--drivers/net/Makefile1
-rw-r--r--drivers/net/mpc5xxx_fec.c (renamed from cpu/mpc5xxx/fec.c)4
-rw-r--r--drivers/net/mpc5xxx_fec.h (renamed from cpu/mpc5xxx/fec.h)4
-rw-r--r--include/mpc5xxx_sdma.h (renamed from cpu/mpc5xxx/sdma.h)0
5 files changed, 4 insertions, 7 deletions
diff --git a/cpu/mpc5xxx/Makefile b/cpu/mpc5xxx/Makefile
index 312b0bf..06fdbcf 100644
--- 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 bcf31cb..c68d3e7 100644
--- 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
index bf804ee..3d3eb8b 100644
--- 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
index 81756a5..16c3e8e 100644
--- 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
index 8b740e4..8b740e4 100644
--- a/cpu/mpc5xxx/sdma.h
+++ b/include/mpc5xxx_sdma.h