drivers/net : move net drivers to drivers/net

Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>

diff --git a/Makefile b/Makefile
index 8272965ab3fcfc19b92075c526ced2b8cf53cf90..e68454a7bf410faf6b366bdc34723ac3e8bbcb65 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)

diff --git a/board/cds/mpc8541cds/u-boot.lds b/board/cds/mpc8541cds/u-boot.lds
index dc87a122a100621e88138fe34b5f1a709b96d524..7a5daefeb752f7b9318444d0125cde0650b41fad 100644 (file)
--- a/board/cds/mpc8541cds/u-boot.lds
+++ b/board/cds/mpc8541cds/u-boot.lds
@@ -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)

diff --git a/board/cds/mpc8548cds/u-boot.lds b/board/cds/mpc8548cds/u-boot.lds
index 530ba5a721de26669b2de97e81697f03c5191c94..b19c481a96af3e1325b1f2a4d064859ad99d5cf6 100644 (file)
--- a/board/cds/mpc8548cds/u-boot.lds
+++ b/board/cds/mpc8548cds/u-boot.lds
@@ -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)

diff --git a/board/cds/mpc8555cds/u-boot.lds b/board/cds/mpc8555cds/u-boot.lds
index 9285928dc428d89171745c1701628cb566dd0c7c..de0923a0d8b1e60c9104bf13292c9409a0fc036d 100644 (file)
--- a/board/cds/mpc8555cds/u-boot.lds
+++ b/board/cds/mpc8555cds/u-boot.lds
@@ -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)

diff --git a/board/mpl/vcma9/cmd_vcma9.c b/board/mpl/vcma9/cmd_vcma9.c
index 227c49272cef347b406202c658b1a3f53734a66a..90a1b08e24996955ecf0e5ec23e27fbfb37de022 100644 (file)
--- a/board/mpl/vcma9/cmd_vcma9.c
+++ b/board/mpl/vcma9/cmd_vcma9.c
@@ -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)
 {

diff --git a/board/netstar/eeprom.c b/board/netstar/eeprom.c
index fef3822aae2c2a9206e7b4a72b3799651f185a7c..0de594b65f27161b33039e22aa311bd6446d5dc4 100644 (file)
--- a/board/netstar/eeprom.c
+++ b/board/netstar/eeprom.c
@@ -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
 

diff --git a/board/voiceblue/eeprom.c b/board/voiceblue/eeprom.c
index 0ad1b666b917baf9dca15c1a51eb51a998cec447..d8ea6e5731c32d172f043fd3622349473c1cd639 100644 (file)
--- a/board/voiceblue/eeprom.c
+++ b/board/voiceblue/eeprom.c
@@ -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
 

diff --git a/drivers/Makefile b/drivers/Makefile
index c7fc5972280ba3f1e62320f691f30aa65b8b63aa..4b6f5f017f49b0586bb9324116a8cc4d6e446420 100755 (executable)
--- a/drivers/Makefile
+++ b/drivers/Makefile
@@ -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
@@ -62,38 +61,6 @@ COBJS-y += serial_max3100.o
 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
 #

diff --git a/drivers/3c589.c b/drivers/net/3c589.c
similarity index 100%
rename from drivers/3c589.c
rename to drivers/net/3c589.c

diff --git a/drivers/3c589.h b/drivers/net/3c589.h
similarity index 100%
rename from drivers/3c589.h
rename to drivers/net/3c589.h

diff --git a/drivers/5701rls.c b/drivers/net/5701rls.c
similarity index 100%
rename from drivers/5701rls.c
rename to drivers/net/5701rls.c

diff --git a/drivers/5701rls.h b/drivers/net/5701rls.h
similarity index 100%
rename from drivers/5701rls.h
rename to drivers/net/5701rls.h

diff --git a/drivers/8390.h b/drivers/net/8390.h
similarity index 100%
rename from drivers/8390.h
rename to drivers/net/8390.h

diff --git a/drivers/net/Makefile b/drivers/net/Makefile
index 37d69b9949bd94d6a97d272f32c6cc626d8b6a99..41e1bdeb3bc227513581b66dbc3170d26e3255ce 100644 (file)
--- a/drivers/net/Makefile
+++ b/drivers/net/Makefile
@@ -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))
 

diff --git a/drivers/bcm570x.c b/drivers/net/bcm570x.c
similarity index 100%
rename from drivers/bcm570x.c
rename to drivers/net/bcm570x.c

diff --git a/drivers/bcm570x_autoneg.c b/drivers/net/bcm570x_autoneg.c
similarity index 100%
rename from drivers/bcm570x_autoneg.c
rename to drivers/net/bcm570x_autoneg.c

diff --git a/drivers/bcm570x_autoneg.h b/drivers/net/bcm570x_autoneg.h
similarity index 100%
rename from drivers/bcm570x_autoneg.h
rename to drivers/net/bcm570x_autoneg.h

diff --git a/drivers/bcm570x_bits.h b/drivers/net/bcm570x_bits.h
similarity index 100%
rename from drivers/bcm570x_bits.h
rename to drivers/net/bcm570x_bits.h

diff --git a/drivers/bcm570x_debug.h b/drivers/net/bcm570x_debug.h
similarity index 100%
rename from drivers/bcm570x_debug.h
rename to drivers/net/bcm570x_debug.h

diff --git a/drivers/bcm570x_lm.h b/drivers/net/bcm570x_lm.h
similarity index 100%
rename from drivers/bcm570x_lm.h
rename to drivers/net/bcm570x_lm.h

diff --git a/drivers/bcm570x_mm.h b/drivers/net/bcm570x_mm.h
similarity index 100%
rename from drivers/bcm570x_mm.h
rename to drivers/net/bcm570x_mm.h

diff --git a/drivers/bcm570x_queue.h b/drivers/net/bcm570x_queue.h
similarity index 100%
rename from drivers/bcm570x_queue.h
rename to drivers/net/bcm570x_queue.h

diff --git a/drivers/cs8900.c b/drivers/net/cs8900.c
similarity index 100%
rename from drivers/cs8900.c
rename to drivers/net/cs8900.c

diff --git a/drivers/cs8900.h b/drivers/net/cs8900.h
similarity index 100%
rename from drivers/cs8900.h
rename to drivers/net/cs8900.h

diff --git a/drivers/dc2114x.c b/drivers/net/dc2114x.c
similarity index 100%
rename from drivers/dc2114x.c
rename to drivers/net/dc2114x.c

diff --git a/drivers/dm9000x.c b/drivers/net/dm9000x.c
similarity index 100%
rename from drivers/dm9000x.c
rename to drivers/net/dm9000x.c

diff --git a/drivers/dm9000x.h b/drivers/net/dm9000x.h
similarity index 100%
rename from drivers/dm9000x.h
rename to drivers/net/dm9000x.h

diff --git a/drivers/e1000.c b/drivers/net/e1000.c
similarity index 100%
rename from drivers/e1000.c
rename to drivers/net/e1000.c

diff --git a/drivers/e1000.h b/drivers/net/e1000.h
similarity index 100%
rename from drivers/e1000.h
rename to drivers/net/e1000.h

diff --git a/drivers/eepro100.c b/drivers/net/eepro100.c
similarity index 100%
rename from drivers/eepro100.c
rename to drivers/net/eepro100.c

diff --git a/drivers/enc28j60.c b/drivers/net/enc28j60.c
similarity index 100%
rename from drivers/enc28j60.c
rename to drivers/net/enc28j60.c

diff --git a/drivers/inca-ip_sw.c b/drivers/net/inca-ip_sw.c
similarity index 100%
rename from drivers/inca-ip_sw.c
rename to drivers/net/inca-ip_sw.c

diff --git a/drivers/ks8695eth.c b/drivers/net/ks8695eth.c
similarity index 100%
rename from drivers/ks8695eth.c
rename to drivers/net/ks8695eth.c

diff --git a/drivers/lan91c96.c b/drivers/net/lan91c96.c
similarity index 100%
rename from drivers/lan91c96.c
rename to drivers/net/lan91c96.c

diff --git a/drivers/lan91c96.h b/drivers/net/lan91c96.h
similarity index 100%
rename from drivers/lan91c96.h
rename to drivers/net/lan91c96.h

diff --git a/drivers/macb.c b/drivers/net/macb.c
similarity index 100%
rename from drivers/macb.c
rename to drivers/net/macb.c

diff --git a/drivers/macb.h b/drivers/net/macb.h
similarity index 100%
rename from drivers/macb.h
rename to drivers/net/macb.h

diff --git a/drivers/natsemi.c b/drivers/net/natsemi.c
similarity index 100%
rename from drivers/natsemi.c
rename to drivers/net/natsemi.c

diff --git a/drivers/ne2000.c b/drivers/net/ne2000.c
similarity index 100%
rename from drivers/ne2000.c
rename to drivers/net/ne2000.c

diff --git a/drivers/ne2000.h b/drivers/net/ne2000.h
similarity index 100%
rename from drivers/ne2000.h
rename to drivers/net/ne2000.h

diff --git a/drivers/netarm_eth.c b/drivers/net/netarm_eth.c
similarity index 100%
rename from drivers/netarm_eth.c
rename to drivers/net/netarm_eth.c

diff --git a/drivers/netarm_eth.h b/drivers/net/netarm_eth.h
similarity index 100%
rename from drivers/netarm_eth.h
rename to drivers/net/netarm_eth.h

diff --git a/drivers/netconsole.c b/drivers/net/netconsole.c
similarity index 100%
rename from drivers/netconsole.c
rename to drivers/net/netconsole.c

diff --git a/drivers/nicext.h b/drivers/net/nicext.h
similarity index 100%
rename from drivers/nicext.h
rename to drivers/net/nicext.h

diff --git a/drivers/ns7520_eth.c b/drivers/net/ns7520_eth.c
similarity index 100%
rename from drivers/ns7520_eth.c
rename to drivers/net/ns7520_eth.c

diff --git a/drivers/ns8382x.c b/drivers/net/ns8382x.c
similarity index 100%
rename from drivers/ns8382x.c
rename to drivers/net/ns8382x.c

diff --git a/drivers/ns9750_eth.c b/drivers/net/ns9750_eth.c
similarity index 100%
rename from drivers/ns9750_eth.c
rename to drivers/net/ns9750_eth.c

diff --git a/drivers/pcnet.c b/drivers/net/pcnet.c
similarity index 100%
rename from drivers/pcnet.c
rename to drivers/net/pcnet.c

diff --git a/drivers/plb2800_eth.c b/drivers/net/plb2800_eth.c
similarity index 100%
rename from drivers/plb2800_eth.c
rename to drivers/net/plb2800_eth.c

diff --git a/drivers/rtl8019.c b/drivers/net/rtl8019.c
similarity index 100%
rename from drivers/rtl8019.c
rename to drivers/net/rtl8019.c

diff --git a/drivers/rtl8019.h b/drivers/net/rtl8019.h
similarity index 100%
rename from drivers/rtl8019.h
rename to drivers/net/rtl8019.h

diff --git a/drivers/rtl8139.c b/drivers/net/rtl8139.c
similarity index 100%
rename from drivers/rtl8139.c
rename to drivers/net/rtl8139.c

diff --git a/drivers/rtl8169.c b/drivers/net/rtl8169.c
similarity index 100%
rename from drivers/rtl8169.c
rename to drivers/net/rtl8169.c

diff --git a/drivers/s3c4510b_eth.c b/drivers/net/s3c4510b_eth.c
similarity index 100%
rename from drivers/s3c4510b_eth.c
rename to drivers/net/s3c4510b_eth.c

diff --git a/drivers/s3c4510b_eth.h b/drivers/net/s3c4510b_eth.h
similarity index 100%
rename from drivers/s3c4510b_eth.h
rename to drivers/net/s3c4510b_eth.h

diff --git a/drivers/sk98lin/Makefile b/drivers/net/sk98lin/Makefile
similarity index 100%
rename from drivers/sk98lin/Makefile
rename to drivers/net/sk98lin/Makefile

diff --git a/drivers/sk98lin/h/lm80.h b/drivers/net/sk98lin/h/lm80.h
similarity index 100%
rename from drivers/sk98lin/h/lm80.h
rename to drivers/net/sk98lin/h/lm80.h

diff --git a/drivers/sk98lin/h/skaddr.h b/drivers/net/sk98lin/h/skaddr.h
similarity index 100%
rename from drivers/sk98lin/h/skaddr.h
rename to drivers/net/sk98lin/h/skaddr.h

diff --git a/drivers/sk98lin/h/skcsum.h b/drivers/net/sk98lin/h/skcsum.h
similarity index 100%
rename from drivers/sk98lin/h/skcsum.h
rename to drivers/net/sk98lin/h/skcsum.h

diff --git a/drivers/sk98lin/h/skdebug.h b/drivers/net/sk98lin/h/skdebug.h
similarity index 100%
rename from drivers/sk98lin/h/skdebug.h
rename to drivers/net/sk98lin/h/skdebug.h

diff --git a/drivers/sk98lin/h/skdrv1st.h b/drivers/net/sk98lin/h/skdrv1st.h
similarity index 100%
rename from drivers/sk98lin/h/skdrv1st.h
rename to drivers/net/sk98lin/h/skdrv1st.h

diff --git a/drivers/sk98lin/h/skdrv2nd.h b/drivers/net/sk98lin/h/skdrv2nd.h
similarity index 100%
rename from drivers/sk98lin/h/skdrv2nd.h
rename to drivers/net/sk98lin/h/skdrv2nd.h

diff --git a/drivers/sk98lin/h/skerror.h b/drivers/net/sk98lin/h/skerror.h
similarity index 100%
rename from drivers/sk98lin/h/skerror.h
rename to drivers/net/sk98lin/h/skerror.h

diff --git a/drivers/sk98lin/h/skgedrv.h b/drivers/net/sk98lin/h/skgedrv.h
similarity index 100%
rename from drivers/sk98lin/h/skgedrv.h
rename to drivers/net/sk98lin/h/skgedrv.h

diff --git a/drivers/sk98lin/h/skgehw.h b/drivers/net/sk98lin/h/skgehw.h
similarity index 100%
rename from drivers/sk98lin/h/skgehw.h
rename to drivers/net/sk98lin/h/skgehw.h

diff --git a/drivers/sk98lin/h/skgehwt.h b/drivers/net/sk98lin/h/skgehwt.h
similarity index 100%
rename from drivers/sk98lin/h/skgehwt.h
rename to drivers/net/sk98lin/h/skgehwt.h

diff --git a/drivers/sk98lin/h/skgei2c.h b/drivers/net/sk98lin/h/skgei2c.h
similarity index 100%
rename from drivers/sk98lin/h/skgei2c.h
rename to drivers/net/sk98lin/h/skgei2c.h

diff --git a/drivers/sk98lin/h/skgeinit.h b/drivers/net/sk98lin/h/skgeinit.h
similarity index 100%
rename from drivers/sk98lin/h/skgeinit.h
rename to drivers/net/sk98lin/h/skgeinit.h

diff --git a/drivers/sk98lin/h/skgepnm2.h b/drivers/net/sk98lin/h/skgepnm2.h
similarity index 100%
rename from drivers/sk98lin/h/skgepnm2.h
rename to drivers/net/sk98lin/h/skgepnm2.h

diff --git a/drivers/sk98lin/h/skgepnmi.h b/drivers/net/sk98lin/h/skgepnmi.h
similarity index 100%
rename from drivers/sk98lin/h/skgepnmi.h
rename to drivers/net/sk98lin/h/skgepnmi.h

diff --git a/drivers/sk98lin/h/skgesirq.h b/drivers/net/sk98lin/h/skgesirq.h
similarity index 100%
rename from drivers/sk98lin/h/skgesirq.h
rename to drivers/net/sk98lin/h/skgesirq.h

diff --git a/drivers/sk98lin/h/ski2c.h b/drivers/net/sk98lin/h/ski2c.h
similarity index 100%
rename from drivers/sk98lin/h/ski2c.h
rename to drivers/net/sk98lin/h/ski2c.h

diff --git a/drivers/sk98lin/h/skqueue.h b/drivers/net/sk98lin/h/skqueue.h
similarity index 100%
rename from drivers/sk98lin/h/skqueue.h
rename to drivers/net/sk98lin/h/skqueue.h

diff --git a/drivers/sk98lin/h/skrlmt.h b/drivers/net/sk98lin/h/skrlmt.h
similarity index 100%
rename from drivers/sk98lin/h/skrlmt.h
rename to drivers/net/sk98lin/h/skrlmt.h

diff --git a/drivers/sk98lin/h/sktimer.h b/drivers/net/sk98lin/h/sktimer.h
similarity index 100%
rename from drivers/sk98lin/h/sktimer.h
rename to drivers/net/sk98lin/h/sktimer.h

diff --git a/drivers/sk98lin/h/sktypes.h b/drivers/net/sk98lin/h/sktypes.h
similarity index 100%
rename from drivers/sk98lin/h/sktypes.h
rename to drivers/net/sk98lin/h/sktypes.h

diff --git a/drivers/sk98lin/h/skversion.h b/drivers/net/sk98lin/h/skversion.h
similarity index 100%
rename from drivers/sk98lin/h/skversion.h
rename to drivers/net/sk98lin/h/skversion.h

diff --git a/drivers/sk98lin/h/skvpd.h b/drivers/net/sk98lin/h/skvpd.h
similarity index 100%
rename from drivers/sk98lin/h/skvpd.h
rename to drivers/net/sk98lin/h/skvpd.h

diff --git a/drivers/sk98lin/h/xmac_ii.h b/drivers/net/sk98lin/h/xmac_ii.h
similarity index 100%
rename from drivers/sk98lin/h/xmac_ii.h
rename to drivers/net/sk98lin/h/xmac_ii.h

diff --git a/drivers/sk98lin/skaddr.c b/drivers/net/sk98lin/skaddr.c
similarity index 100%
rename from drivers/sk98lin/skaddr.c
rename to drivers/net/sk98lin/skaddr.c

diff --git a/drivers/sk98lin/skcsum.c b/drivers/net/sk98lin/skcsum.c
similarity index 100%
rename from drivers/sk98lin/skcsum.c
rename to drivers/net/sk98lin/skcsum.c

diff --git a/drivers/sk98lin/skge.c b/drivers/net/sk98lin/skge.c
similarity index 100%
rename from drivers/sk98lin/skge.c
rename to drivers/net/sk98lin/skge.c

diff --git a/drivers/sk98lin/skgehwt.c b/drivers/net/sk98lin/skgehwt.c
similarity index 100%
rename from drivers/sk98lin/skgehwt.c
rename to drivers/net/sk98lin/skgehwt.c

diff --git a/drivers/sk98lin/skgeinit.c b/drivers/net/sk98lin/skgeinit.c
similarity index 100%
rename from drivers/sk98lin/skgeinit.c
rename to drivers/net/sk98lin/skgeinit.c

diff --git a/drivers/sk98lin/skgemib.c b/drivers/net/sk98lin/skgemib.c
similarity index 100%
rename from drivers/sk98lin/skgemib.c
rename to drivers/net/sk98lin/skgemib.c

diff --git a/drivers/sk98lin/skgepnmi.c b/drivers/net/sk98lin/skgepnmi.c
similarity index 100%
rename from drivers/sk98lin/skgepnmi.c
rename to drivers/net/sk98lin/skgepnmi.c

diff --git a/drivers/sk98lin/skgesirq.c b/drivers/net/sk98lin/skgesirq.c
similarity index 100%
rename from drivers/sk98lin/skgesirq.c
rename to drivers/net/sk98lin/skgesirq.c

diff --git a/drivers/sk98lin/ski2c.c b/drivers/net/sk98lin/ski2c.c
similarity index 100%
rename from drivers/sk98lin/ski2c.c
rename to drivers/net/sk98lin/ski2c.c

diff --git a/drivers/sk98lin/sklm80.c b/drivers/net/sk98lin/sklm80.c
similarity index 100%
rename from drivers/sk98lin/sklm80.c
rename to drivers/net/sk98lin/sklm80.c

diff --git a/drivers/sk98lin/skproc.c b/drivers/net/sk98lin/skproc.c
similarity index 100%
rename from drivers/sk98lin/skproc.c
rename to drivers/net/sk98lin/skproc.c

diff --git a/drivers/sk98lin/skqueue.c b/drivers/net/sk98lin/skqueue.c
similarity index 100%
rename from drivers/sk98lin/skqueue.c
rename to drivers/net/sk98lin/skqueue.c

diff --git a/drivers/sk98lin/skrlmt.c b/drivers/net/sk98lin/skrlmt.c
similarity index 100%
rename from drivers/sk98lin/skrlmt.c
rename to drivers/net/sk98lin/skrlmt.c

diff --git a/drivers/sk98lin/sktimer.c b/drivers/net/sk98lin/sktimer.c
similarity index 100%
rename from drivers/sk98lin/sktimer.c
rename to drivers/net/sk98lin/sktimer.c

diff --git a/drivers/sk98lin/skvpd.c b/drivers/net/sk98lin/skvpd.c
similarity index 100%
rename from drivers/sk98lin/skvpd.c
rename to drivers/net/sk98lin/skvpd.c

diff --git a/drivers/sk98lin/skxmac2.c b/drivers/net/sk98lin/skxmac2.c
similarity index 100%
rename from drivers/sk98lin/skxmac2.c
rename to drivers/net/sk98lin/skxmac2.c

diff --git a/drivers/sk98lin/u-boot_compat.h b/drivers/net/sk98lin/u-boot_compat.h
similarity index 100%
rename from drivers/sk98lin/u-boot_compat.h
rename to drivers/net/sk98lin/u-boot_compat.h

diff --git a/drivers/sk98lin/uboot_drv.c b/drivers/net/sk98lin/uboot_drv.c
similarity index 100%
rename from drivers/sk98lin/uboot_drv.c
rename to drivers/net/sk98lin/uboot_drv.c

diff --git a/drivers/sk98lin/uboot_skb.c b/drivers/net/sk98lin/uboot_skb.c
similarity index 100%
rename from drivers/sk98lin/uboot_skb.c
rename to drivers/net/sk98lin/uboot_skb.c

diff --git a/drivers/smc91111.c b/drivers/net/smc91111.c
similarity index 100%
rename from drivers/smc91111.c
rename to drivers/net/smc91111.c

diff --git a/drivers/smc91111.h b/drivers/net/smc91111.h
similarity index 100%
rename from drivers/smc91111.h
rename to drivers/net/smc91111.h

diff --git a/drivers/tigon3.c b/drivers/net/tigon3.c
similarity index 100%
rename from drivers/tigon3.c
rename to drivers/net/tigon3.c

diff --git a/drivers/tigon3.h b/drivers/net/tigon3.h
similarity index 100%
rename from drivers/tigon3.h
rename to drivers/net/tigon3.h

diff --git a/drivers/tsec.c b/drivers/net/tsec.c
similarity index 100%
rename from drivers/tsec.c
rename to drivers/net/tsec.c

diff --git a/drivers/tsec.h b/drivers/net/tsec.h
similarity index 100%
rename from drivers/tsec.h
rename to drivers/net/tsec.h

diff --git a/drivers/tsi108_eth.c b/drivers/net/tsi108_eth.c
similarity index 100%
rename from drivers/tsi108_eth.c
rename to drivers/net/tsi108_eth.c

diff --git a/drivers/uli526x.c b/drivers/net/uli526x.c
similarity index 100%
rename from drivers/uli526x.c
rename to drivers/net/uli526x.c

diff --git a/examples/smc91111_eeprom.c b/examples/smc91111_eeprom.c
index 98e3e86ffa555906b0eb34c2cd3fff40fb425767..b8a3594e9e546f901af9449849d239834dcc9cf1 100644 (file)
--- a/examples/smc91111_eeprom.c
+++ b/examples/smc91111_eeprom.c
@@ -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;

diff --git a/lib_arm/board.c b/lib_arm/board.c
index 7e97f13476d8c8ec84426a5f7072a7bd5739f579..6f35aa06bf981b0594f9951eaf08b7ec7d1f6dd7 100644 (file)
--- a/lib_arm/board.c
+++ b/lib_arm/board.c
@@ -46,10 +46,10 @@
 #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;

diff --git a/lib_blackfin/board.c b/lib_blackfin/board.c
index 7c9990f8e0d2b583b1abbadb7bdbeb004645b70c..86a3b67c9899b2cba04c3979435f13e2d30cd5b9 100644 (file)
--- a/lib_blackfin/board.c
+++ b/lib_blackfin/board.c
@@ -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>