drivers/net : move net drivers to drivers/net
authorJean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
Wed, 21 Nov 2007 20:19:24 +0000 (21:19 +0100)
committerJean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
Sun, 25 Nov 2007 17:35:17 +0000 (18:35 +0100)
Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
109 files changed:
Makefile
board/cds/mpc8541cds/u-boot.lds
board/cds/mpc8548cds/u-boot.lds
board/cds/mpc8555cds/u-boot.lds
board/mpl/vcma9/cmd_vcma9.c
board/netstar/eeprom.c
board/voiceblue/eeprom.c
drivers/Makefile
drivers/net/3c589.c [moved from drivers/3c589.c with 100% similarity]
drivers/net/3c589.h [moved from drivers/3c589.h with 100% similarity]
drivers/net/5701rls.c [moved from drivers/5701rls.c with 100% similarity]
drivers/net/5701rls.h [moved from drivers/5701rls.h with 100% similarity]
drivers/net/8390.h [moved from drivers/8390.h with 100% similarity]
drivers/net/Makefile
drivers/net/bcm570x.c [moved from drivers/bcm570x.c with 100% similarity]
drivers/net/bcm570x_autoneg.c [moved from drivers/bcm570x_autoneg.c with 100% similarity]
drivers/net/bcm570x_autoneg.h [moved from drivers/bcm570x_autoneg.h with 100% similarity]
drivers/net/bcm570x_bits.h [moved from drivers/bcm570x_bits.h with 100% similarity]
drivers/net/bcm570x_debug.h [moved from drivers/bcm570x_debug.h with 100% similarity]
drivers/net/bcm570x_lm.h [moved from drivers/bcm570x_lm.h with 100% similarity]
drivers/net/bcm570x_mm.h [moved from drivers/bcm570x_mm.h with 100% similarity]
drivers/net/bcm570x_queue.h [moved from drivers/bcm570x_queue.h with 100% similarity]
drivers/net/cs8900.c [moved from drivers/cs8900.c with 100% similarity]
drivers/net/cs8900.h [moved from drivers/cs8900.h with 100% similarity]
drivers/net/dc2114x.c [moved from drivers/dc2114x.c with 100% similarity]
drivers/net/dm9000x.c [moved from drivers/dm9000x.c with 100% similarity]
drivers/net/dm9000x.h [moved from drivers/dm9000x.h with 100% similarity]
drivers/net/e1000.c [moved from drivers/e1000.c with 100% similarity]
drivers/net/e1000.h [moved from drivers/e1000.h with 100% similarity]
drivers/net/eepro100.c [moved from drivers/eepro100.c with 100% similarity]
drivers/net/enc28j60.c [moved from drivers/enc28j60.c with 100% similarity]
drivers/net/inca-ip_sw.c [moved from drivers/inca-ip_sw.c with 100% similarity]
drivers/net/ks8695eth.c [moved from drivers/ks8695eth.c with 100% similarity]
drivers/net/lan91c96.c [moved from drivers/lan91c96.c with 100% similarity]
drivers/net/lan91c96.h [moved from drivers/lan91c96.h with 100% similarity]
drivers/net/macb.c [moved from drivers/macb.c with 100% similarity]
drivers/net/macb.h [moved from drivers/macb.h with 100% similarity]
drivers/net/natsemi.c [moved from drivers/natsemi.c with 100% similarity]
drivers/net/ne2000.c [moved from drivers/ne2000.c with 100% similarity]
drivers/net/ne2000.h [moved from drivers/ne2000.h with 100% similarity]
drivers/net/netarm_eth.c [moved from drivers/netarm_eth.c with 100% similarity]
drivers/net/netarm_eth.h [moved from drivers/netarm_eth.h with 100% similarity]
drivers/net/netconsole.c [moved from drivers/netconsole.c with 100% similarity]
drivers/net/nicext.h [moved from drivers/nicext.h with 100% similarity]
drivers/net/ns7520_eth.c [moved from drivers/ns7520_eth.c with 100% similarity]
drivers/net/ns8382x.c [moved from drivers/ns8382x.c with 100% similarity]
drivers/net/ns9750_eth.c [moved from drivers/ns9750_eth.c with 100% similarity]
drivers/net/pcnet.c [moved from drivers/pcnet.c with 100% similarity]
drivers/net/plb2800_eth.c [moved from drivers/plb2800_eth.c with 100% similarity]
drivers/net/rtl8019.c [moved from drivers/rtl8019.c with 100% similarity]
drivers/net/rtl8019.h [moved from drivers/rtl8019.h with 100% similarity]
drivers/net/rtl8139.c [moved from drivers/rtl8139.c with 100% similarity]
drivers/net/rtl8169.c [moved from drivers/rtl8169.c with 100% similarity]
drivers/net/s3c4510b_eth.c [moved from drivers/s3c4510b_eth.c with 100% similarity]
drivers/net/s3c4510b_eth.h [moved from drivers/s3c4510b_eth.h with 100% similarity]
drivers/net/sk98lin/Makefile [moved from drivers/sk98lin/Makefile with 100% similarity]
drivers/net/sk98lin/h/lm80.h [moved from drivers/sk98lin/h/lm80.h with 100% similarity]
drivers/net/sk98lin/h/skaddr.h [moved from drivers/sk98lin/h/skaddr.h with 100% similarity]
drivers/net/sk98lin/h/skcsum.h [moved from drivers/sk98lin/h/skcsum.h with 100% similarity]
drivers/net/sk98lin/h/skdebug.h [moved from drivers/sk98lin/h/skdebug.h with 100% similarity]
drivers/net/sk98lin/h/skdrv1st.h [moved from drivers/sk98lin/h/skdrv1st.h with 100% similarity]
drivers/net/sk98lin/h/skdrv2nd.h [moved from drivers/sk98lin/h/skdrv2nd.h with 100% similarity]
drivers/net/sk98lin/h/skerror.h [moved from drivers/sk98lin/h/skerror.h with 100% similarity]
drivers/net/sk98lin/h/skgedrv.h [moved from drivers/sk98lin/h/skgedrv.h with 100% similarity]
drivers/net/sk98lin/h/skgehw.h [moved from drivers/sk98lin/h/skgehw.h with 100% similarity]
drivers/net/sk98lin/h/skgehwt.h [moved from drivers/sk98lin/h/skgehwt.h with 100% similarity]
drivers/net/sk98lin/h/skgei2c.h [moved from drivers/sk98lin/h/skgei2c.h with 100% similarity]
drivers/net/sk98lin/h/skgeinit.h [moved from drivers/sk98lin/h/skgeinit.h with 100% similarity]
drivers/net/sk98lin/h/skgepnm2.h [moved from drivers/sk98lin/h/skgepnm2.h with 100% similarity]
drivers/net/sk98lin/h/skgepnmi.h [moved from drivers/sk98lin/h/skgepnmi.h with 100% similarity]
drivers/net/sk98lin/h/skgesirq.h [moved from drivers/sk98lin/h/skgesirq.h with 100% similarity]
drivers/net/sk98lin/h/ski2c.h [moved from drivers/sk98lin/h/ski2c.h with 100% similarity]
drivers/net/sk98lin/h/skqueue.h [moved from drivers/sk98lin/h/skqueue.h with 100% similarity]
drivers/net/sk98lin/h/skrlmt.h [moved from drivers/sk98lin/h/skrlmt.h with 100% similarity]
drivers/net/sk98lin/h/sktimer.h [moved from drivers/sk98lin/h/sktimer.h with 100% similarity]
drivers/net/sk98lin/h/sktypes.h [moved from drivers/sk98lin/h/sktypes.h with 100% similarity]
drivers/net/sk98lin/h/skversion.h [moved from drivers/sk98lin/h/skversion.h with 100% similarity]
drivers/net/sk98lin/h/skvpd.h [moved from drivers/sk98lin/h/skvpd.h with 100% similarity]
drivers/net/sk98lin/h/xmac_ii.h [moved from drivers/sk98lin/h/xmac_ii.h with 100% similarity]
drivers/net/sk98lin/skaddr.c [moved from drivers/sk98lin/skaddr.c with 100% similarity]
drivers/net/sk98lin/skcsum.c [moved from drivers/sk98lin/skcsum.c with 100% similarity]
drivers/net/sk98lin/skge.c [moved from drivers/sk98lin/skge.c with 100% similarity]
drivers/net/sk98lin/skgehwt.c [moved from drivers/sk98lin/skgehwt.c with 100% similarity]
drivers/net/sk98lin/skgeinit.c [moved from drivers/sk98lin/skgeinit.c with 100% similarity]
drivers/net/sk98lin/skgemib.c [moved from drivers/sk98lin/skgemib.c with 100% similarity]
drivers/net/sk98lin/skgepnmi.c [moved from drivers/sk98lin/skgepnmi.c with 100% similarity]
drivers/net/sk98lin/skgesirq.c [moved from drivers/sk98lin/skgesirq.c with 100% similarity]
drivers/net/sk98lin/ski2c.c [moved from drivers/sk98lin/ski2c.c with 100% similarity]
drivers/net/sk98lin/sklm80.c [moved from drivers/sk98lin/sklm80.c with 100% similarity]
drivers/net/sk98lin/skproc.c [moved from drivers/sk98lin/skproc.c with 100% similarity]
drivers/net/sk98lin/skqueue.c [moved from drivers/sk98lin/skqueue.c with 100% similarity]
drivers/net/sk98lin/skrlmt.c [moved from drivers/sk98lin/skrlmt.c with 100% similarity]
drivers/net/sk98lin/sktimer.c [moved from drivers/sk98lin/sktimer.c with 100% similarity]
drivers/net/sk98lin/skvpd.c [moved from drivers/sk98lin/skvpd.c with 100% similarity]
drivers/net/sk98lin/skxmac2.c [moved from drivers/sk98lin/skxmac2.c with 100% similarity]
drivers/net/sk98lin/u-boot_compat.h [moved from drivers/sk98lin/u-boot_compat.h with 100% similarity]
drivers/net/sk98lin/uboot_drv.c [moved from drivers/sk98lin/uboot_drv.c with 100% similarity]
drivers/net/sk98lin/uboot_skb.c [moved from drivers/sk98lin/uboot_skb.c with 100% similarity]
drivers/net/smc91111.c [moved from drivers/smc91111.c with 100% similarity]
drivers/net/smc91111.h [moved from drivers/smc91111.h with 100% similarity]
drivers/net/tigon3.c [moved from drivers/tigon3.c with 100% similarity]
drivers/net/tigon3.h [moved from drivers/tigon3.h with 100% similarity]
drivers/net/tsec.c [moved from drivers/tsec.c with 100% similarity]
drivers/net/tsec.h [moved from drivers/tsec.h with 100% similarity]
drivers/net/tsi108_eth.c [moved from drivers/tsi108_eth.c with 100% similarity]
drivers/net/uli526x.c [moved from drivers/uli526x.c with 100% similarity]
examples/smc91111_eeprom.c
lib_arm/board.c
lib_blackfin/board.c

index 8272965..e68454a 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -207,16 +207,17 @@ LIBS += net/libnet.a
 LIBS += disk/libdisk.a
 LIBS += rtc/librtc.a
 LIBS += dtt/libdtt.a
-LIBS += drivers/i2c/libi2c.a
-LIBS += drivers/pci/libpci.a
-LIBS += drivers/pcmcia/libpcmcia.a
-LIBS += drivers/video/libvideo.a
 LIBS += drivers/libdrivers.a
 LIBS += drivers/bios_emulator/libatibiosemu.a
+LIBS += drivers/i2c/libi2c.a
 LIBS += drivers/nand/libnand.a
 LIBS += drivers/nand_legacy/libnand_legacy.a
-LIBS += drivers/onenand/libonenand.a
 LIBS += drivers/net/libnet.a
+LIBS += drivers/net/sk98lin/libsk98lin.a
+LIBS += drivers/onenand/libonenand.a
+LIBS += drivers/pci/libpci.a
+LIBS += drivers/pcmcia/libpcmcia.a
+LIBS += drivers/video/libvideo.a
 ifeq ($(CPU),mpc83xx)
 LIBS += drivers/qe/qe.a
 endif
@@ -224,7 +225,6 @@ ifeq ($(CPU),mpc85xx)
 LIBS += drivers/qe/qe.a
 endif
 LIBS += drivers/serial/libserial.a
-LIBS += drivers/sk98lin/libsk98lin.a
 LIBS += post/libpost.a post/drivers/libpostdrivers.a
 LIBS += $(shell if [ -d post/lib_$(ARCH) ]; then echo \
        "post/lib_$(ARCH)/libpost$(ARCH).a"; fi)
index dc87a12..7a5daef 100644 (file)
@@ -69,7 +69,7 @@ SECTIONS
     cpu/mpc85xx/interrupts.o (.text)
     cpu/mpc85xx/cpu_init.o (.text)
     cpu/mpc85xx/cpu.o (.text)
-    drivers/tsec.o (.text)
+    drivers/net/tsec.o (.text)
     cpu/mpc85xx/speed.o (.text)
     cpu/mpc85xx/pci.o (.text)
     common/dlmalloc.o (.text)
index 530ba5a..b19c481 100644 (file)
@@ -69,7 +69,7 @@ SECTIONS
     cpu/mpc85xx/interrupts.o (.text)
     cpu/mpc85xx/cpu_init.o (.text)
     cpu/mpc85xx/cpu.o (.text)
-    drivers/tsec.o (.text)
+    drivers/net/tsec.o (.text)
     cpu/mpc85xx/speed.o (.text)
     common/dlmalloc.o (.text)
     lib_generic/crc32.o (.text)
index 9285928..de0923a 100644 (file)
@@ -69,7 +69,7 @@ SECTIONS
     cpu/mpc85xx/interrupts.o (.text)
     cpu/mpc85xx/cpu_init.o (.text)
     cpu/mpc85xx/cpu.o (.text)
-    drivers/tsec.o (.text)
+    drivers/net/tsec.o (.text)
     cpu/mpc85xx/speed.o (.text)
     cpu/mpc85xx/pci.o (.text)
     common/dlmalloc.o (.text)
index 227c492..90a1b08 100644 (file)
@@ -31,7 +31,7 @@
 #include "../common/common_util.h"
 
 #if defined(CONFIG_DRIVER_CS8900)
-#include <../drivers/cs8900.h>
+#include <../drivers/net/cs8900.h>
 
 static uchar cs8900_chksum(ushort data)
 {
index fef3822..0de594b 100644 (file)
@@ -26,7 +26,7 @@
 
 #include <common.h>
 #include <exports.h>
-#include "../drivers/smc91111.h"
+#include "../drivers/net/smc91111.h"
 
 #define SMC_BASE_ADDRESS CONFIG_SMC91111_BASE
 
index 0ad1b66..d8ea6e5 100644 (file)
@@ -26,7 +26,7 @@
 
 #include <common.h>
 #include <exports.h>
-#include "../drivers/smc91111.h"
+#include "../drivers/net/smc91111.h"
 
 #define SMC_BASE_ADDRESS CONFIG_SMC91111_BASE
 
index c7fc597..4b6f5f0 100755 (executable)
@@ -51,7 +51,6 @@ COBJS-y += systemace.o
 COBJS-y += atmel_usart.o
 COBJS-y += i8042.o
 COBJS-y += keyboard.o
-COBJS-y += netconsole.o
 COBJS-y += ns16550.o
 COBJS-y += pc_keyb.o
 COBJS-y += ps2ser.o
@@ -63,38 +62,6 @@ COBJS-y += serial_xuartlite.o
 COBJS-y += usbtty.o
 
 #
-# Network Drivers
-#
-COBJS-y += 3c589.o
-COBJS-y += bcm570x.o bcm570x_autoneg.o 5701rls.o
-COBJS-y += cs8900.o
-COBJS-y += dc2114x.o
-COBJS-y += dm9000x.o
-COBJS-y += e1000.o
-COBJS-y += eepro100.o
-COBJS-y += enc28j60.o
-COBJS-y += inca-ip_sw.o
-COBJS-y += ks8695eth.o
-COBJS-y += lan91c96.o
-COBJS-y += macb.o
-COBJS-y += natsemi.o
-COBJS-y += ne2000.o
-COBJS-y += netarm_eth.o
-COBJS-y += ns7520_eth.o
-COBJS-y += ns8382x.o
-COBJS-y += pcnet.o
-COBJS-y += plb2800_eth.o
-COBJS-y += rtl8019.o
-COBJS-y += rtl8139.o
-COBJS-y += rtl8169.o
-COBJS-y += s3c4510b_eth.o
-COBJS-y += smc91111.o
-COBJS-y += tigon3.o
-COBJS-y += tsec.o
-COBJS-y += tsi108_eth.o
-COBJS-y += uli526x.o
-
-#
 # USB Drivers
 #
 COBJS-y += isp116x-hcd.o
similarity index 100%
rename from drivers/3c589.c
rename to drivers/net/3c589.c
similarity index 100%
rename from drivers/3c589.h
rename to drivers/net/3c589.h
similarity index 100%
rename from drivers/5701rls.c
rename to drivers/net/5701rls.c
similarity index 100%
rename from drivers/5701rls.h
rename to drivers/net/5701rls.h
similarity index 100%
rename from drivers/8390.h
rename to drivers/net/8390.h
index 37d69b9..41e1bde 100644 (file)
@@ -25,8 +25,39 @@ include $(TOPDIR)/config.mk
 
 LIB    := $(obj)libnet.a
 
-COBJS  := mcffec.o
+COBJS-y += 3c589.o
+COBJS-y += bcm570x.o bcm570x_autoneg.o 5701rls.o
+COBJS-y += cs8900.o
+COBJS-y += dc2114x.o
+COBJS-y += dm9000x.o
+COBJS-y += e1000.o
+COBJS-y += eepro100.o
+COBJS-y += enc28j60.o
+COBJS-y += inca-ip_sw.o
+COBJS-y += ks8695eth.o
+COBJS-y += lan91c96.o
+COBJS-y += macb.o
+COBJS-y += mcffec.o
+COBJS-y += natsemi.o
+COBJS-y += ne2000.o
+COBJS-y += netarm_eth.o
+COBJS-y += netconsole.o
+COBJS-y += ns7520_eth.o
+COBJS-y += ns8382x.o
+COBJS-y += ns9750_eth.o
+COBJS-y += pcnet.o
+COBJS-y += plb2800_eth.o
+COBJS-y += rtl8019.o
+COBJS-y += rtl8139.o
+COBJS-y += rtl8169.o
+COBJS-y += s3c4510b_eth.o
+COBJS-y += smc91111.o
+COBJS-y += tigon3.o
+COBJS-y += tsec.o
+COBJS-y += tsi108_eth.o
+COBJS-y += uli526x.o
 
+COBJS  := $(COBJS-y)
 SRCS   := $(COBJS:.o=.c)
 OBJS   := $(addprefix $(obj),$(COBJS))
 
similarity index 100%
rename from drivers/bcm570x.c
rename to drivers/net/bcm570x.c
similarity index 100%
rename from drivers/cs8900.c
rename to drivers/net/cs8900.c
similarity index 100%
rename from drivers/cs8900.h
rename to drivers/net/cs8900.h
similarity index 100%
rename from drivers/dc2114x.c
rename to drivers/net/dc2114x.c
similarity index 100%
rename from drivers/dm9000x.c
rename to drivers/net/dm9000x.c
similarity index 100%
rename from drivers/dm9000x.h
rename to drivers/net/dm9000x.h
similarity index 100%
rename from drivers/e1000.c
rename to drivers/net/e1000.c
similarity index 100%
rename from drivers/e1000.h
rename to drivers/net/e1000.h
similarity index 100%
rename from drivers/eepro100.c
rename to drivers/net/eepro100.c
similarity index 100%
rename from drivers/enc28j60.c
rename to drivers/net/enc28j60.c
similarity index 100%
rename from drivers/ks8695eth.c
rename to drivers/net/ks8695eth.c
similarity index 100%
rename from drivers/lan91c96.c
rename to drivers/net/lan91c96.c
similarity index 100%
rename from drivers/lan91c96.h
rename to drivers/net/lan91c96.h
similarity index 100%
rename from drivers/macb.c
rename to drivers/net/macb.c
similarity index 100%
rename from drivers/macb.h
rename to drivers/net/macb.h
similarity index 100%
rename from drivers/natsemi.c
rename to drivers/net/natsemi.c
similarity index 100%
rename from drivers/ne2000.c
rename to drivers/net/ne2000.c
similarity index 100%
rename from drivers/ne2000.h
rename to drivers/net/ne2000.h
similarity index 100%
rename from drivers/nicext.h
rename to drivers/net/nicext.h
similarity index 100%
rename from drivers/ns8382x.c
rename to drivers/net/ns8382x.c
similarity index 100%
rename from drivers/pcnet.c
rename to drivers/net/pcnet.c
similarity index 100%
rename from drivers/rtl8019.c
rename to drivers/net/rtl8019.c
similarity index 100%
rename from drivers/rtl8019.h
rename to drivers/net/rtl8019.h
similarity index 100%
rename from drivers/rtl8139.c
rename to drivers/net/rtl8139.c
similarity index 100%
rename from drivers/rtl8169.c
rename to drivers/net/rtl8169.c
similarity index 100%
rename from drivers/smc91111.c
rename to drivers/net/smc91111.c
similarity index 100%
rename from drivers/smc91111.h
rename to drivers/net/smc91111.h
similarity index 100%
rename from drivers/tigon3.c
rename to drivers/net/tigon3.c
similarity index 100%
rename from drivers/tigon3.h
rename to drivers/net/tigon3.h
similarity index 100%
rename from drivers/tsec.c
rename to drivers/net/tsec.c
similarity index 100%
rename from drivers/tsec.h
rename to drivers/net/tsec.h
similarity index 100%
rename from drivers/uli526x.c
rename to drivers/net/uli526x.c
index 98e3e86..b8a3594 100644 (file)
@@ -29,7 +29,7 @@
 
 #include <common.h>
 #include <exports.h>
-#include "../drivers/smc91111.h"
+#include "../drivers/net/smc91111.h"
 
 #define SMC_BASE_ADDRESS CONFIG_SMC91111_BASE
 #define EEPROM         0x1;
index 7e97f13..6f35aa0 100644 (file)
 #include <net.h>
 
 #ifdef CONFIG_DRIVER_SMC91111
-#include "../drivers/smc91111.h"
+#include "../drivers/net/smc91111.h"
 #endif
 #ifdef CONFIG_DRIVER_LAN91C96
-#include "../drivers/lan91c96.h"
+#include "../drivers/net/lan91c96.h"
 #endif
 
 DECLARE_GLOBAL_DATA_PTR;
index 7c9990f..86a3b67 100644 (file)
@@ -35,7 +35,7 @@
 #include <i2c.h>
 #include "blackfin_board.h"
 #include <asm/cplb.h>
-#include "../drivers/smc91111.h"
+#include "../drivers/net/smc91111.h"
 
 #if defined(CONFIG_BF537)&&defined(CONFIG_POST)
 #include <post.h>