Start moving ethernet drivers to new directory
Subsystems (2)
cover Start moving ethernet drivers to new directory
As discussed a few times, here's a start at moving various files around in drivers/net to a new drivers/net/ethernet directory.
The general idea is to move one at a time compilation units associated to the various subsystems in drivers/net, updating the Kconfig and Makefile files.
I think this is a form that doesn't break the build, is reviewable and acceptable and makes the top level drivers/net directory much cleaner.
The biggest downsides of this move style are:
o high number of trivial commits so:
o serialization: it's best done by one person because the likelihood of commit clash will be also be high.
o the order the entries in Kconfig are changed, so the order of entries in menuconfig/xconfig is also changed.
An alternative to the high commit count is to collect many of these patches together into a single commit.
If this approach is acceptable, I'll do all the unmaintained ethernet subsystems in drivers/net in this style, followed by adding separate subdirectories for 3com and 8390, moving tulip, then onto the various vendor directories as appropriate.
Moving bonding, ppp, and such to different directories will be done separately.
David, the Sun GEM and Cassini files are currently selected under the 10/100 menu. Shouldn't these be presented under the 1000Mb menu? I didn't move them to that menu so all current configs should work, but it'd be logically sensible to move the selection for these subsystems to the 1000 menu though maybe that's not practical.
Comments?
Joe Perches (6):
drivers/net: Add directory ethernet
ethernet: Move ethoc.c
ethernet: Move dnet.[ch]
ethernet: Move Sun Happymeal sunhme.[ch]
ethernet: Move Sun GEM sungem*.[ch]
ethernet: Move Sun Cassini cassini.[ch]
drivers/net/Kconfig | 56 +++---------------------------
drivers/net/Makefile | 7 +---
drivers/net/ethernet/Kconfig.10-100 | 53 +++++++++++++++++++++++++++++
drivers/net/ethernet/Kconfig.1000 | 3 ++
drivers/net/ethernet/Kconfig.10000 | 3 ++
drivers/net/ethernet/Makefile | 9 +++++
drivers/net/{ => ethernet}/cassini.c | 0
drivers/net/{ => ethernet}/cassini.h | 0
drivers/net/{ => ethernet}/dnet.c | 0
drivers/net/{ => ethernet}/dnet.h | 0
drivers/net/{ => ethernet}/ethoc.c | 0
drivers/net/{ => ethernet}/sungem.c | 0
drivers/net/{ => ethernet}/sungem.h | 0
drivers/net/{ => ethernet}/sungem_phy.c | 0
drivers/net/{ => ethernet}/sungem_phy.h | 0
drivers/net/{ => ethernet}/sunhme.c | 0
drivers/net/{ => ethernet}/sunhme.h | 0
17 files changed, 76 insertions(+), 55 deletions(-)
create mode 100644 drivers/net/ethernet/Kconfig.10-100
create mode 100644 drivers/net/ethernet/Kconfig.1000
create mode 100644 drivers/net/ethernet/Kconfig.10000
create mode 100644 drivers/net/ethernet/Makefile
rename drivers/net/{ => ethernet}/cassini.c (100%)
rename drivers/net/{ => ethernet}/cassini.h (100%)
rename drivers/net/{ => ethernet}/dnet.c (100%)
rename drivers/net/{ => ethernet}/dnet.h (100%)
rename drivers/net/{ => ethernet}/ethoc.c (100%)
rename drivers/net/{ => ethernet}/sungem.c (100%)
rename drivers/net/{ => ethernet}/sungem.h (100%)
rename drivers/net/{ => ethernet}/sungem_phy.c (100%)
rename drivers/net/{ => ethernet}/sungem_phy.h (100%)
rename drivers/net/{ => ethernet}/sunhme.c (100%)
rename drivers/net/{ => ethernet}/sunhme.h (100%)Signature · 1 line
1.7.3.3.398.g0b0cd.dirty
RFC PATCH 1/6 drivers/net: Add directory ethernet
Add empty Kconfig files for various speeds and a no effect Makefile. Modify drivers/net Kconfig and Makefile to include these new files.
--- drivers/net/Kconfig | 6 ++++++ drivers/net/Makefile | 2 ++ drivers/net/ethernet/Kconfig.10-100 | 3 +++ drivers/net/ethernet/Kconfig.1000 | 3 +++ drivers/net/ethernet/Kconfig.10000 | 3 +++ drivers/net/ethernet/Makefile | 9 +++++++++ 6 files changed, 26 insertions(+), 0 deletions(-) create mode 100644 drivers/net/ethernet/Kconfig.10-100 create mode 100644 drivers/net/ethernet/Kconfig.1000 create mode 100644 drivers/net/ethernet/Kconfig.10000 create mode 100644 drivers/net/ethernet/Makefile
drivers/net/Kconfig +6 -0
@@ -222,6 +222,8 @@ menuconfig NET_ETHERNET if NET_ETHERNET +source "drivers/net/ethernet/Kconfig.10-100" + config MACB tristate "Atmel MACB support" depends on HAVE_NET_MACB
@@ -2041,6 +2043,8 @@ menuconfig NETDEV_1000 if NETDEV_1000 +source "drivers/net/ethernet/Kconfig.1000" + config ACENIC tristate "Alteon AceNIC/3Com 3C985/NetGear GA620 Gigabit support" depends on PCI
@@ -2569,6 +2573,8 @@ menuconfig NETDEV_10000 if NETDEV_10000 +source "drivers/net/ethernet/Kconfig.10000" + config MDIO tristate
drivers/net/Makefile +2 -0
@@ -2,6 +2,8 @@ # Makefile for the Linux network (ethercard) device drivers. # +obj-y += ethernet/ + obj-$(CONFIG_MII) += mii.o obj-$(CONFIG_MDIO) += mdio.o obj-$(CONFIG_PHYLIB) += phy/
drivers/net/ethernet/Kconfig.10-100 new file +3 -0
@@ -0,0 +1,3 @@ +# +# 10 Mb and 100Mb ethernet device configuration +#
drivers/net/ethernet/Kconfig.1000 new file +3 -0
@@ -0,0 +1,3 @@ +# +# 1 Gb ethernet device configuration +#
drivers/net/ethernet/Kconfig.10000 new file +3 -0
@@ -0,0 +1,3 @@ +# +# 10 Gb ethernet device configuration +#
drivers/net/ethernet/Makefile new file +9 -0
@@ -0,0 +1,9 @@ +# +# Makefile for ethernet device drivers +# + +# Dummy object just to avoid breaking build +# These comments and the line below will be deleted on the +# first addition to this file + +obj-$(CONFIG_ETHERNET_DUMMY_DRIVER) += /dev/null/dummy.o
Signature · 1 line
1.7.3.3.398.g0b0cd.dirty
RFC PATCH 2/6 ethernet: Move ethoc.c
In reply to Joe PerchesMove ethernet Open Core file to ethernet directory.
---
drivers/net/Kconfig | 10 ----------
drivers/net/Makefile | 1 -
drivers/net/ethernet/Kconfig.10-100 | 10 ++++++++++
drivers/net/ethernet/Makefile | 6 +-----
drivers/net/{ => ethernet}/ethoc.c | 0
5 files changed, 11 insertions(+), 16 deletions(-)
rename drivers/net/{ => ethernet}/ethoc.c (100%)drivers/net/Kconfig +0 -10
@@ -1021,16 +1021,6 @@ config ENC28J60_WRITEVERIFY Enable the verify after the buffer write useful for debugging purpose. If unsure, say N. -config ETHOC - tristate "OpenCores 10/100 Mbps Ethernet MAC support" - depends on NET_ETHERNET && HAS_IOMEM && HAS_DMA - select MII - select PHYLIB - select CRC32 - select BITREVERSE - help - Say Y here if you want to use the OpenCores 10/100 Mbps Ethernet MAC. - config GRETH tristate "Aeroflex Gaisler GRETH Ethernet MAC support" depends on SPARC
drivers/net/Makefile +0 -1
@@ -257,7 +257,6 @@ obj-$(CONFIG_PASEMI_MAC) += pasemi_mac_driver.o pasemi_mac_driver-objs := pasemi_mac.o pasemi_mac_ethtool.o obj-$(CONFIG_MLX4_CORE) += mlx4/ obj-$(CONFIG_ENC28J60) += enc28j60.o -obj-$(CONFIG_ETHOC) += ethoc.o obj-$(CONFIG_GRETH) += greth.o obj-$(CONFIG_XTENSA_XT2000_SONIC) += xtsonic.o
drivers/net/ethernet/Kconfig.10-100 +10 -0
@@ -1,3 +1,13 @@ # # 10 Mb and 100Mb ethernet device configuration # + +config ETHOC + tristate "OpenCores 10/100 Mbps Ethernet MAC support" + depends on NET_ETHERNET && HAS_IOMEM && HAS_DMA + select MII + select PHYLIB + select CRC32 + select BITREVERSE + help + Say Y here if you want to use the OpenCores 10/100 Mbps Ethernet MAC.
drivers/net/ethernet/Makefile +1 -5
@@ -2,8 +2,4 @@ # Makefile for ethernet device drivers # -# Dummy object just to avoid breaking build -# These comments and the line below will be deleted on the -# first addition to this file - -obj-$(CONFIG_ETHERNET_DUMMY_DRIVER) += /dev/null/dummy.o +obj-$(CONFIG_ETHOC) += ethoc.o
drivers/net/ethernet/ethoc.c renamed from drivers/net/ethoc.c +0 -0
Signature · 1 line
1.7.3.3.398.g0b0cd.dirty
RFC PATCH 3/6 ethernet: Move dnet.[ch]
In reply to Joe PerchesMove dnet files to ethernet directory.
---
drivers/net/Kconfig | 11 -----------
drivers/net/Makefile | 1 -
drivers/net/ethernet/Kconfig.10-100 | 11 +++++++++++
drivers/net/ethernet/Makefile | 1 +
drivers/net/{ => ethernet}/dnet.c | 0
drivers/net/{ => ethernet}/dnet.h | 0
6 files changed, 12 insertions(+), 12 deletions(-)
rename drivers/net/{ => ethernet}/dnet.c (100%)
rename drivers/net/{ => ethernet}/dnet.h (100%)drivers/net/Kconfig +0 -11
@@ -1114,17 +1114,6 @@ config NI65 To compile this driver as a module, choose M here. The module will be called ni65. -config DNET - tristate "Dave ethernet support (DNET)" - depends on NET_ETHERNET && HAS_IOMEM - select PHYLIB - help - The Dave ethernet interface (DNET) is found on Qong Board FPGA. - Say Y to include support for the DNET chip. - - To compile this driver as a module, choose M here: the module - will be called dnet. - source "drivers/net/tulip/Kconfig" config AT1700
drivers/net/Makefile +0 -1
@@ -261,7 +261,6 @@ obj-$(CONFIG_GRETH) += greth.o obj-$(CONFIG_XTENSA_XT2000_SONIC) += xtsonic.o -obj-$(CONFIG_DNET) += dnet.o obj-$(CONFIG_MACB) += macb.o obj-$(CONFIG_S6GMAC) += s6gmac.o
drivers/net/ethernet/Kconfig.10-100 +11 -0
@@ -2,6 +2,17 @@ # 10 Mb and 100Mb ethernet device configuration # +config DNET + tristate "Dave ethernet support (DNET)" + depends on NET_ETHERNET && HAS_IOMEM + select PHYLIB + help + The Dave ethernet interface (DNET) is found on Qong Board FPGA. + Say Y to include support for the DNET chip. + + To compile this driver as a module, choose M here: the module + will be called dnet. + config ETHOC tristate "OpenCores 10/100 Mbps Ethernet MAC support" depends on NET_ETHERNET && HAS_IOMEM && HAS_DMA
drivers/net/ethernet/Makefile +1 -0
@@ -2,4 +2,5 @@ # Makefile for ethernet device drivers # +obj-$(CONFIG_DNET) += dnet.o obj-$(CONFIG_ETHOC) += ethoc.o
drivers/net/ethernet/dnet.c renamed from drivers/net/dnet.c +0 -0
drivers/net/ethernet/dnet.h renamed from drivers/net/dnet.h +0 -0
Signature · 1 line
1.7.3.3.398.g0b0cd.dirty
RFC PATCH 4/6 ethernet: Move Sun Happymeal sunhme.[ch]
In reply to Joe PerchesMove Sun Happymeal files to ethernet directory.
---
drivers/net/Kconfig | 13 -------------
drivers/net/Makefile | 1 -
drivers/net/ethernet/Kconfig.10-100 | 13 +++++++++++++
drivers/net/ethernet/Makefile | 1 +
drivers/net/{ => ethernet}/sunhme.c | 0
drivers/net/{ => ethernet}/sunhme.h | 0
6 files changed, 14 insertions(+), 14 deletions(-)
rename drivers/net/{ => ethernet}/sunhme.c (100%)
rename drivers/net/{ => ethernet}/sunhme.h (100%)drivers/net/Kconfig +0 -13
@@ -558,19 +558,6 @@ config SUNLANCE To compile this driver as a module, choose M here: the module will be called sunlance. -config HAPPYMEAL - tristate "Sun Happy Meal 10/100baseT support" - depends on SBUS || PCI - select CRC32 - help - This driver supports the "hme" interface present on most Ultra - systems and as an option on older Sbus systems. This driver supports - both PCI and Sbus devices. This driver also supports the "qfe" quad - 100baseT device available in both PCI and Sbus configurations. - - To compile this driver as a module, choose M here: the module - will be called sunhme. - config SUNBMAC tristate "Sun BigMAC 10/100baseT support (EXPERIMENTAL)" depends on SBUS && EXPERIMENTAL
drivers/net/Makefile +0 -1
@@ -56,7 +56,6 @@ obj-$(CONFIG_PLIP) += plip.o obj-$(CONFIG_ROADRUNNER) += rrunner.o -obj-$(CONFIG_HAPPYMEAL) += sunhme.o obj-$(CONFIG_SUNLANCE) += sunlance.o obj-$(CONFIG_SUNQE) += sunqe.o obj-$(CONFIG_SUNBMAC) += sunbmac.o
drivers/net/ethernet/Kconfig.10-100 +13 -0
@@ -22,3 +22,16 @@ config ETHOC select BITREVERSE help Say Y here if you want to use the OpenCores 10/100 Mbps Ethernet MAC. + +config HAPPYMEAL + tristate "Sun Happy Meal 10/100baseT support" + depends on SBUS || PCI + select CRC32 + help + This driver supports the "hme" interface present on most Ultra + systems and as an option on older Sbus systems. This driver supports + both PCI and Sbus devices. This driver also supports the "qfe" quad + 100baseT device available in both PCI and Sbus configurations. + + To compile this driver as a module, choose M here: the module + will be called sunhme.
drivers/net/ethernet/Makefile +1 -0
@@ -4,3 +4,4 @@ obj-$(CONFIG_DNET) += dnet.o obj-$(CONFIG_ETHOC) += ethoc.o +obj-$(CONFIG_HAPPYMEAL) += sunhme.o
drivers/net/ethernet/sunhme.c renamed from drivers/net/sunhme.c +0 -0
drivers/net/ethernet/sunhme.h renamed from drivers/net/sunhme.h +0 -0
Signature · 1 line
1.7.3.3.398.g0b0cd.dirty
RFC PATCH 5/6 ethernet: Move Sun GEM sungem*.[ch]
In reply to Joe PerchesMove Sun GEM files to ethernet directory.
---
drivers/net/Kconfig | 8 --------
drivers/net/Makefile | 1 -
drivers/net/ethernet/Kconfig.10-100 | 8 ++++++++
drivers/net/ethernet/Makefile | 1 +
drivers/net/{ => ethernet}/sungem.c | 0
drivers/net/{ => ethernet}/sungem.h | 0
drivers/net/{ => ethernet}/sungem_phy.c | 0
drivers/net/{ => ethernet}/sungem_phy.h | 0
8 files changed, 9 insertions(+), 9 deletions(-)
rename drivers/net/{ => ethernet}/sungem.c (100%)
rename drivers/net/{ => ethernet}/sungem.h (100%)
rename drivers/net/{ => ethernet}/sungem_phy.c (100%)
rename drivers/net/{ => ethernet}/sungem_phy.h (100%)drivers/net/Kconfig +0 -8
@@ -581,14 +581,6 @@ config SUNQE To compile this driver as a module, choose M here: the module will be called sunqe. -config SUNGEM - tristate "Sun GEM support" - depends on PCI - select CRC32 - help - Support for the Sun GEM chip, aka Sun GigabitEthernet/P 2.0. See also - <http://www.sun.com/products-n-solutions/hardware/docs/pdf/806-3985-10.pdf>. - config CASSINI tristate "Sun Cassini support" depends on PCI
drivers/net/Makefile +0 -1
@@ -60,7 +60,6 @@ obj-$(CONFIG_SUNLANCE) += sunlance.o obj-$(CONFIG_SUNQE) += sunqe.o obj-$(CONFIG_SUNBMAC) += sunbmac.o obj-$(CONFIG_MYRI_SBUS) += myri_sbus.o -obj-$(CONFIG_SUNGEM) += sungem.o sungem_phy.o obj-$(CONFIG_CASSINI) += cassini.o obj-$(CONFIG_SUNVNET) += sunvnet.o
drivers/net/ethernet/Kconfig.10-100 +8 -0
@@ -35,3 +35,11 @@ config HAPPYMEAL To compile this driver as a module, choose M here: the module will be called sunhme. + +config SUNGEM + tristate "Sun GEM support" + depends on PCI + select CRC32 + help + Support for the Sun GEM chip, aka Sun GigabitEthernet/P 2.0. See also + <http://www.sun.com/products-n-solutions/hardware/docs/pdf/806-3985-10.pdf>.
drivers/net/ethernet/Makefile +1 -0
@@ -5,3 +5,4 @@ obj-$(CONFIG_DNET) += dnet.o obj-$(CONFIG_ETHOC) += ethoc.o obj-$(CONFIG_HAPPYMEAL) += sunhme.o +obj-$(CONFIG_SUNGEM) += sungem.o sungem_phy.o
drivers/net/ethernet/sungem.c renamed from drivers/net/sungem.c +0 -0
drivers/net/ethernet/sungem.h renamed from drivers/net/sungem.h +0 -0
drivers/net/ethernet/sungem_phy.c renamed from drivers/net/sungem_phy.c +0 -0
drivers/net/ethernet/sungem_phy.h renamed from drivers/net/sungem_phy.h +0 -0
Signature · 1 line
1.7.3.3.398.g0b0cd.dirty
RFC PATCH 6/6 ethernet: Move Sun Cassini cassini.[ch]
In reply to Joe PerchesMove Sun Cassini files to ethernet directory.
---
drivers/net/Kconfig | 8 --------
drivers/net/Makefile | 1 -
drivers/net/ethernet/Kconfig.10-100 | 8 ++++++++
drivers/net/ethernet/Makefile | 1 +
drivers/net/{ => ethernet}/cassini.c | 0
drivers/net/{ => ethernet}/cassini.h | 0
6 files changed, 9 insertions(+), 9 deletions(-)
rename drivers/net/{ => ethernet}/cassini.c (100%)
rename drivers/net/{ => ethernet}/cassini.h (100%)drivers/net/Kconfig +0 -8
@@ -581,14 +581,6 @@ config SUNQE To compile this driver as a module, choose M here: the module will be called sunqe. -config CASSINI - tristate "Sun Cassini support" - depends on PCI - select CRC32 - help - Support for the Sun Cassini chip, aka Sun GigaSwift Ethernet. See also - <http://www.sun.com/products-n-solutions/hardware/docs/pdf/817-4341-10.pdf> - config SUNVNET tristate "Sun Virtual Network support" depends on SUN_LDOMS
drivers/net/Makefile +0 -1
@@ -60,7 +60,6 @@ obj-$(CONFIG_SUNLANCE) += sunlance.o obj-$(CONFIG_SUNQE) += sunqe.o obj-$(CONFIG_SUNBMAC) += sunbmac.o obj-$(CONFIG_MYRI_SBUS) += myri_sbus.o -obj-$(CONFIG_CASSINI) += cassini.o obj-$(CONFIG_SUNVNET) += sunvnet.o obj-$(CONFIG_MACE) += mace.o
drivers/net/ethernet/Kconfig.10-100 +8 -0
@@ -23,6 +23,14 @@ config ETHOC help Say Y here if you want to use the OpenCores 10/100 Mbps Ethernet MAC. +config CASSINI + tristate "Sun Cassini support" + depends on PCI + select CRC32 + help + Support for the Sun Cassini chip, aka Sun GigaSwift Ethernet. See also + <http://www.sun.com/products-n-solutions/hardware/docs/pdf/817-4341-10.pdf> + config HAPPYMEAL tristate "Sun Happy Meal 10/100baseT support" depends on SBUS || PCI
drivers/net/ethernet/Makefile +1 -0
@@ -6,3 +6,4 @@ obj-$(CONFIG_DNET) += dnet.o obj-$(CONFIG_ETHOC) += ethoc.o obj-$(CONFIG_HAPPYMEAL) += sunhme.o obj-$(CONFIG_SUNGEM) += sungem.o sungem_phy.o +obj-$(CONFIG_CASSINI) += cassini.o
drivers/net/ethernet/cassini.c renamed from drivers/net/cassini.c +0 -0
drivers/net/ethernet/cassini.h renamed from drivers/net/cassini.h +0 -0
Signature · 1 line
1.7.3.3.398.g0b0cd.dirty