浏览代码

drivers/net : move net drivers to drivers/net

Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
Jean-Christophe PLAGNIOL-VILLARD 16 年之前
父节点
当前提交
2439e4bfa1
共有 100 个文件被更改,包括 44 次插入46 次删除
  1. 6 6
      Makefile
  2. 1 1
      board/cds/mpc8541cds/u-boot.lds
  3. 1 1
      board/cds/mpc8548cds/u-boot.lds
  4. 1 1
      board/cds/mpc8555cds/u-boot.lds
  5. 1 1
      board/mpl/vcma9/cmd_vcma9.c
  6. 1 1
      board/netstar/eeprom.c
  7. 1 1
      board/voiceblue/eeprom.c
  8. 0 33
      drivers/Makefile
  9. 0 0
      drivers/net/3c589.c
  10. 0 0
      drivers/net/3c589.h
  11. 0 0
      drivers/net/5701rls.c
  12. 0 0
      drivers/net/5701rls.h
  13. 0 0
      drivers/net/8390.h
  14. 32 1
      drivers/net/Makefile
  15. 0 0
      drivers/net/bcm570x.c
  16. 0 0
      drivers/net/bcm570x_autoneg.c
  17. 0 0
      drivers/net/bcm570x_autoneg.h
  18. 0 0
      drivers/net/bcm570x_bits.h
  19. 0 0
      drivers/net/bcm570x_debug.h
  20. 0 0
      drivers/net/bcm570x_lm.h
  21. 0 0
      drivers/net/bcm570x_mm.h
  22. 0 0
      drivers/net/bcm570x_queue.h
  23. 0 0
      drivers/net/cs8900.c
  24. 0 0
      drivers/net/cs8900.h
  25. 0 0
      drivers/net/dc2114x.c
  26. 0 0
      drivers/net/dm9000x.c
  27. 0 0
      drivers/net/dm9000x.h
  28. 0 0
      drivers/net/e1000.c
  29. 0 0
      drivers/net/e1000.h
  30. 0 0
      drivers/net/eepro100.c
  31. 0 0
      drivers/net/enc28j60.c
  32. 0 0
      drivers/net/inca-ip_sw.c
  33. 0 0
      drivers/net/ks8695eth.c
  34. 0 0
      drivers/net/lan91c96.c
  35. 0 0
      drivers/net/lan91c96.h
  36. 0 0
      drivers/net/macb.c
  37. 0 0
      drivers/net/macb.h
  38. 0 0
      drivers/net/natsemi.c
  39. 0 0
      drivers/net/ne2000.c
  40. 0 0
      drivers/net/ne2000.h
  41. 0 0
      drivers/net/netarm_eth.c
  42. 0 0
      drivers/net/netarm_eth.h
  43. 0 0
      drivers/net/netconsole.c
  44. 0 0
      drivers/net/nicext.h
  45. 0 0
      drivers/net/ns7520_eth.c
  46. 0 0
      drivers/net/ns8382x.c
  47. 0 0
      drivers/net/ns9750_eth.c
  48. 0 0
      drivers/net/pcnet.c
  49. 0 0
      drivers/net/plb2800_eth.c
  50. 0 0
      drivers/net/rtl8019.c
  51. 0 0
      drivers/net/rtl8019.h
  52. 0 0
      drivers/net/rtl8139.c
  53. 0 0
      drivers/net/rtl8169.c
  54. 0 0
      drivers/net/s3c4510b_eth.c
  55. 0 0
      drivers/net/s3c4510b_eth.h
  56. 0 0
      drivers/net/sk98lin/Makefile
  57. 0 0
      drivers/net/sk98lin/h/lm80.h
  58. 0 0
      drivers/net/sk98lin/h/skaddr.h
  59. 0 0
      drivers/net/sk98lin/h/skcsum.h
  60. 0 0
      drivers/net/sk98lin/h/skdebug.h
  61. 0 0
      drivers/net/sk98lin/h/skdrv1st.h
  62. 0 0
      drivers/net/sk98lin/h/skdrv2nd.h
  63. 0 0
      drivers/net/sk98lin/h/skerror.h
  64. 0 0
      drivers/net/sk98lin/h/skgedrv.h
  65. 0 0
      drivers/net/sk98lin/h/skgehw.h
  66. 0 0
      drivers/net/sk98lin/h/skgehwt.h
  67. 0 0
      drivers/net/sk98lin/h/skgei2c.h
  68. 0 0
      drivers/net/sk98lin/h/skgeinit.h
  69. 0 0
      drivers/net/sk98lin/h/skgepnm2.h
  70. 0 0
      drivers/net/sk98lin/h/skgepnmi.h
  71. 0 0
      drivers/net/sk98lin/h/skgesirq.h
  72. 0 0
      drivers/net/sk98lin/h/ski2c.h
  73. 0 0
      drivers/net/sk98lin/h/skqueue.h
  74. 0 0
      drivers/net/sk98lin/h/skrlmt.h
  75. 0 0
      drivers/net/sk98lin/h/sktimer.h
  76. 0 0
      drivers/net/sk98lin/h/sktypes.h
  77. 0 0
      drivers/net/sk98lin/h/skversion.h
  78. 0 0
      drivers/net/sk98lin/h/skvpd.h
  79. 0 0
      drivers/net/sk98lin/h/xmac_ii.h
  80. 0 0
      drivers/net/sk98lin/skaddr.c
  81. 0 0
      drivers/net/sk98lin/skcsum.c
  82. 0 0
      drivers/net/sk98lin/skge.c
  83. 0 0
      drivers/net/sk98lin/skgehwt.c
  84. 0 0
      drivers/net/sk98lin/skgeinit.c
  85. 0 0
      drivers/net/sk98lin/skgemib.c
  86. 0 0
      drivers/net/sk98lin/skgepnmi.c
  87. 0 0
      drivers/net/sk98lin/skgesirq.c
  88. 0 0
      drivers/net/sk98lin/ski2c.c
  89. 0 0
      drivers/net/sk98lin/sklm80.c
  90. 0 0
      drivers/net/sk98lin/skproc.c
  91. 0 0
      drivers/net/sk98lin/skqueue.c
  92. 0 0
      drivers/net/sk98lin/skrlmt.c
  93. 0 0
      drivers/net/sk98lin/sktimer.c
  94. 0 0
      drivers/net/sk98lin/skvpd.c
  95. 0 0
      drivers/net/sk98lin/skxmac2.c
  96. 0 0
      drivers/net/sk98lin/u-boot_compat.h
  97. 0 0
      drivers/net/sk98lin/uboot_drv.c
  98. 0 0
      drivers/net/sk98lin/uboot_skb.c
  99. 0 0
      drivers/net/smc91111.c
  100. 0 0
      drivers/net/smc91111.h

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

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

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

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

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

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

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

+ 0 - 33
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
 #

+ 0 - 0
drivers/3c589.c → drivers/net/3c589.c


+ 0 - 0
drivers/3c589.h → drivers/net/3c589.h


+ 0 - 0
drivers/5701rls.c → drivers/net/5701rls.c


+ 0 - 0
drivers/5701rls.h → drivers/net/5701rls.h


+ 0 - 0
drivers/8390.h → drivers/net/8390.h


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

+ 0 - 0
drivers/bcm570x.c → drivers/net/bcm570x.c


+ 0 - 0
drivers/bcm570x_autoneg.c → drivers/net/bcm570x_autoneg.c


+ 0 - 0
drivers/bcm570x_autoneg.h → drivers/net/bcm570x_autoneg.h


+ 0 - 0
drivers/bcm570x_bits.h → drivers/net/bcm570x_bits.h


+ 0 - 0
drivers/bcm570x_debug.h → drivers/net/bcm570x_debug.h


+ 0 - 0
drivers/bcm570x_lm.h → drivers/net/bcm570x_lm.h


+ 0 - 0
drivers/bcm570x_mm.h → drivers/net/bcm570x_mm.h


+ 0 - 0
drivers/bcm570x_queue.h → drivers/net/bcm570x_queue.h


+ 0 - 0
drivers/cs8900.c → drivers/net/cs8900.c


+ 0 - 0
drivers/cs8900.h → drivers/net/cs8900.h


+ 0 - 0
drivers/dc2114x.c → drivers/net/dc2114x.c


+ 0 - 0
drivers/dm9000x.c → drivers/net/dm9000x.c


+ 0 - 0
drivers/dm9000x.h → drivers/net/dm9000x.h


+ 0 - 0
drivers/e1000.c → drivers/net/e1000.c


+ 0 - 0
drivers/e1000.h → drivers/net/e1000.h


+ 0 - 0
drivers/eepro100.c → drivers/net/eepro100.c


+ 0 - 0
drivers/enc28j60.c → drivers/net/enc28j60.c


+ 0 - 0
drivers/inca-ip_sw.c → drivers/net/inca-ip_sw.c


+ 0 - 0
drivers/ks8695eth.c → drivers/net/ks8695eth.c


+ 0 - 0
drivers/lan91c96.c → drivers/net/lan91c96.c


+ 0 - 0
drivers/lan91c96.h → drivers/net/lan91c96.h


+ 0 - 0
drivers/macb.c → drivers/net/macb.c


+ 0 - 0
drivers/macb.h → drivers/net/macb.h


+ 0 - 0
drivers/natsemi.c → drivers/net/natsemi.c


+ 0 - 0
drivers/ne2000.c → drivers/net/ne2000.c


+ 0 - 0
drivers/ne2000.h → drivers/net/ne2000.h


+ 0 - 0
drivers/netarm_eth.c → drivers/net/netarm_eth.c


+ 0 - 0
drivers/netarm_eth.h → drivers/net/netarm_eth.h


+ 0 - 0
drivers/netconsole.c → drivers/net/netconsole.c


+ 0 - 0
drivers/nicext.h → drivers/net/nicext.h


+ 0 - 0
drivers/ns7520_eth.c → drivers/net/ns7520_eth.c


+ 0 - 0
drivers/ns8382x.c → drivers/net/ns8382x.c


+ 0 - 0
drivers/ns9750_eth.c → drivers/net/ns9750_eth.c


+ 0 - 0
drivers/pcnet.c → drivers/net/pcnet.c


+ 0 - 0
drivers/plb2800_eth.c → drivers/net/plb2800_eth.c


+ 0 - 0
drivers/rtl8019.c → drivers/net/rtl8019.c


+ 0 - 0
drivers/rtl8019.h → drivers/net/rtl8019.h


+ 0 - 0
drivers/rtl8139.c → drivers/net/rtl8139.c


+ 0 - 0
drivers/rtl8169.c → drivers/net/rtl8169.c


+ 0 - 0
drivers/s3c4510b_eth.c → drivers/net/s3c4510b_eth.c


+ 0 - 0
drivers/s3c4510b_eth.h → drivers/net/s3c4510b_eth.h


+ 0 - 0
drivers/sk98lin/Makefile → drivers/net/sk98lin/Makefile


+ 0 - 0
drivers/sk98lin/h/lm80.h → drivers/net/sk98lin/h/lm80.h


+ 0 - 0
drivers/sk98lin/h/skaddr.h → drivers/net/sk98lin/h/skaddr.h


+ 0 - 0
drivers/sk98lin/h/skcsum.h → drivers/net/sk98lin/h/skcsum.h


+ 0 - 0
drivers/sk98lin/h/skdebug.h → drivers/net/sk98lin/h/skdebug.h


+ 0 - 0
drivers/sk98lin/h/skdrv1st.h → drivers/net/sk98lin/h/skdrv1st.h


+ 0 - 0
drivers/sk98lin/h/skdrv2nd.h → drivers/net/sk98lin/h/skdrv2nd.h


+ 0 - 0
drivers/sk98lin/h/skerror.h → drivers/net/sk98lin/h/skerror.h


+ 0 - 0
drivers/sk98lin/h/skgedrv.h → drivers/net/sk98lin/h/skgedrv.h


+ 0 - 0
drivers/sk98lin/h/skgehw.h → drivers/net/sk98lin/h/skgehw.h


+ 0 - 0
drivers/sk98lin/h/skgehwt.h → drivers/net/sk98lin/h/skgehwt.h


+ 0 - 0
drivers/sk98lin/h/skgei2c.h → drivers/net/sk98lin/h/skgei2c.h


+ 0 - 0
drivers/sk98lin/h/skgeinit.h → drivers/net/sk98lin/h/skgeinit.h


+ 0 - 0
drivers/sk98lin/h/skgepnm2.h → drivers/net/sk98lin/h/skgepnm2.h


+ 0 - 0
drivers/sk98lin/h/skgepnmi.h → drivers/net/sk98lin/h/skgepnmi.h


+ 0 - 0
drivers/sk98lin/h/skgesirq.h → drivers/net/sk98lin/h/skgesirq.h


+ 0 - 0
drivers/sk98lin/h/ski2c.h → drivers/net/sk98lin/h/ski2c.h


+ 0 - 0
drivers/sk98lin/h/skqueue.h → drivers/net/sk98lin/h/skqueue.h


+ 0 - 0
drivers/sk98lin/h/skrlmt.h → drivers/net/sk98lin/h/skrlmt.h


+ 0 - 0
drivers/sk98lin/h/sktimer.h → drivers/net/sk98lin/h/sktimer.h


+ 0 - 0
drivers/sk98lin/h/sktypes.h → drivers/net/sk98lin/h/sktypes.h


+ 0 - 0
drivers/sk98lin/h/skversion.h → drivers/net/sk98lin/h/skversion.h


+ 0 - 0
drivers/sk98lin/h/skvpd.h → drivers/net/sk98lin/h/skvpd.h


+ 0 - 0
drivers/sk98lin/h/xmac_ii.h → drivers/net/sk98lin/h/xmac_ii.h


+ 0 - 0
drivers/sk98lin/skaddr.c → drivers/net/sk98lin/skaddr.c


+ 0 - 0
drivers/sk98lin/skcsum.c → drivers/net/sk98lin/skcsum.c


+ 0 - 0
drivers/sk98lin/skge.c → drivers/net/sk98lin/skge.c


+ 0 - 0
drivers/sk98lin/skgehwt.c → drivers/net/sk98lin/skgehwt.c


+ 0 - 0
drivers/sk98lin/skgeinit.c → drivers/net/sk98lin/skgeinit.c


+ 0 - 0
drivers/sk98lin/skgemib.c → drivers/net/sk98lin/skgemib.c


+ 0 - 0
drivers/sk98lin/skgepnmi.c → drivers/net/sk98lin/skgepnmi.c


+ 0 - 0
drivers/sk98lin/skgesirq.c → drivers/net/sk98lin/skgesirq.c


+ 0 - 0
drivers/sk98lin/ski2c.c → drivers/net/sk98lin/ski2c.c


+ 0 - 0
drivers/sk98lin/sklm80.c → drivers/net/sk98lin/sklm80.c


+ 0 - 0
drivers/sk98lin/skproc.c → drivers/net/sk98lin/skproc.c


+ 0 - 0
drivers/sk98lin/skqueue.c → drivers/net/sk98lin/skqueue.c


+ 0 - 0
drivers/sk98lin/skrlmt.c → drivers/net/sk98lin/skrlmt.c


+ 0 - 0
drivers/sk98lin/sktimer.c → drivers/net/sk98lin/sktimer.c


+ 0 - 0
drivers/sk98lin/skvpd.c → drivers/net/sk98lin/skvpd.c


+ 0 - 0
drivers/sk98lin/skxmac2.c → drivers/net/sk98lin/skxmac2.c


+ 0 - 0
drivers/sk98lin/u-boot_compat.h → drivers/net/sk98lin/u-boot_compat.h


+ 0 - 0
drivers/sk98lin/uboot_drv.c → drivers/net/sk98lin/uboot_drv.c


+ 0 - 0
drivers/sk98lin/uboot_skb.c → drivers/net/sk98lin/uboot_skb.c


+ 0 - 0
drivers/smc91111.c → drivers/net/smc91111.c


+ 0 - 0
drivers/smc91111.h → drivers/net/smc91111.h


部分文件因为文件数量过多而无法显示