[U-Boot-Users] [PATCH 17/24] drivers/net : move net drivers to drivers/net

Jean-Christophe PLAGNIOL-VILLARD plagnioj at jcrosoft.com
Thu Oct 11 19:26:29 CEST 2007


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

diff --git a/Makefile b/Makefile
index 57038e7..1e07a9d 100644
--- a/Makefile
+++ b/Makefile
@@ -223,6 +223,7 @@ LIBS += drivers/mtd/libmtd.a
 LIBS += drivers/nand/libnand.a
 LIBS += drivers/nand_legacy/libnand_legacy.a
 LIBS += drivers/net/libnet.a
+LIBS += drivers/net/sk98lin/libsk98lin.a
 LIBS += drivers/pci/libpci.a
 LIBS += drivers/pcmcia/libpcmcia.a
 ifeq ($(CPU),mpc83xx)
@@ -234,7 +235,6 @@ endif
 LIBS += drivers/sata/libsata.a
 LIBS += drivers/scsi/libscsi.a
 LIBS += drivers/serial/libserial.a
-LIBS += drivers/sk98lin/libsk98lin.a
 LIBS += drivers/usb/libusb.a
 LIBS += drivers/video/libvideo.a
 LIBS += post/libpost.a post/drivers/libpostdrivers.a
diff --git a/drivers/Makefile b/drivers/Makefile
index 5386313..6cd8ed6 100755
--- a/drivers/Makefile
+++ b/drivers/Makefile
@@ -28,42 +28,6 @@ include $(TOPDIR)/config.mk
 LIB	= $(obj)libdrivers.a
 
 #
-# Console Drivers
-#
-COBJS-y += netconsole.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
-
-#
 # Miscellaneous Drivers
 #
 COBJS-y += ali512x.o
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 7d115fe..efc0743 100644
--- a/drivers/net/Makefile
+++ b/drivers/net/Makefile
@@ -25,7 +25,36 @@ include $(TOPDIR)/config.mk
 
 LIB 	:= $(obj)libnet.a
 
+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	:= $(COBJS-y)
 SRCS 	:= $(COBJS:.o=.c)
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
-- 
1.5.3.2





More information about the U-Boot mailing list