Browse Source

Move MPC5xxx_FEC driver to drivers/net

Signed-off-by: Ben Warren <biggerbadderben@gmail.com>
Ben Warren 15 years ago
parent
commit
80b00af01b
5 changed files with 4 additions and 7 deletions
  1. 1 1
      cpu/mpc5xxx/Makefile
  2. 1 0
      drivers/net/Makefile
  3. 2 2
      drivers/net/mpc5xxx_fec.c
  4. 0 4
      drivers/net/mpc5xxx_fec.h
  5. 0 0
      include/mpc5xxx_sdma.h

+ 1 - 1
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)

+ 1 - 0
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

+ 2 - 2
cpu/mpc5xxx/fec.c → 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;
 

+ 0 - 4
cpu/mpc5xxx/fec.h → 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;

+ 0 - 0
cpu/mpc5xxx/sdma.h → include/mpc5xxx_sdma.h