Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit adfc5217 authored by Jeff Kirsher's avatar Jeff Kirsher
Browse files

broadcom: Move the Broadcom drivers 



Moves the drivers for Broadcom devices into
drivers/net/ethernet/broadcom/ and the necessary Kconfig and Makefile
changes.

CC: Eilon Greenstein <eilong@broadcom.com>
CC: Michael Chan <mchan@broadcom.com>
CC: Matt Carlson <mcarlson@broadcom.com>
CC: Gary Zambrano <zambrano@broadcom.com>
CC: "Maciej W. Rozycki" <macro@linux-mips.org>
Signed-off-by: default avatarJeff Kirsher <jeffrey.t.kirsher@intel.com>
parent 644570b8

MAINTAINERS

+5 −5
Original line number Original line Diff line number Diff line
@@ -1526,27 +1526,27 @@ BROADCOM B44 10/100 ETHERNET DRIVER 
M:	Gary Zambrano <zambrano@broadcom.com>

M:	Gary Zambrano <zambrano@broadcom.com>

L:	netdev@vger.kernel.org

L:	netdev@vger.kernel.org

S:	Supported

S:	Supported

F:	drivers/net/b44.*

F:	drivers/net/ethernet/broadcom/b44.*





BROADCOM BNX2 GIGABIT ETHERNET DRIVER

BROADCOM BNX2 GIGABIT ETHERNET DRIVER

M:	Michael Chan <mchan@broadcom.com>

M:	Michael Chan <mchan@broadcom.com>

L:	netdev@vger.kernel.org

L:	netdev@vger.kernel.org

S:	Supported

S:	Supported

F:	drivers/net/bnx2.*

F:	drivers/net/ethernet/broadcom/bnx2.*

F:	drivers/net/bnx2_*

F:	drivers/net/ethernet/broadcom/bnx2_*





BROADCOM BNX2X 10 GIGABIT ETHERNET DRIVER

BROADCOM BNX2X 10 GIGABIT ETHERNET DRIVER

M:	Eilon Greenstein <eilong@broadcom.com>

M:	Eilon Greenstein <eilong@broadcom.com>

L:	netdev@vger.kernel.org

L:	netdev@vger.kernel.org

S:	Supported

S:	Supported

F:	drivers/net/bnx2x/

F:	drivers/net/ethernet/broadcom/bnx2x/





BROADCOM TG3 GIGABIT ETHERNET DRIVER

BROADCOM TG3 GIGABIT ETHERNET DRIVER

M:	Matt Carlson <mcarlson@broadcom.com>

M:	Matt Carlson <mcarlson@broadcom.com>

M:	Michael Chan <mchan@broadcom.com>

M:	Michael Chan <mchan@broadcom.com>

L:	netdev@vger.kernel.org

L:	netdev@vger.kernel.org

S:	Supported

S:	Supported

F:	drivers/net/tg3.*

F:	drivers/net/ethernet/broadcom/tg3.*





BROADCOM BRCM80211 IEEE802.11n WIRELESS DRIVER

BROADCOM BRCM80211 IEEE802.11n WIRELESS DRIVER

M:	Brett Rudley <brudley@broadcom.com>

M:	Brett Rudley <brudley@broadcom.com>

drivers/net/Kconfig

+0 −99
Original line number Original line Diff line number Diff line
@@ -997,38 +997,6 @@ config APRICOT 
	  To compile this driver as a module, choose M here. The module

	  To compile this driver as a module, choose M here. The module

	  will be called apricot.

	  will be called apricot.





config B44

	tristate "Broadcom 440x/47xx ethernet support"

	depends on SSB_POSSIBLE && HAS_DMA

	select SSB

	select MII

	help

	  If you have a network (Ethernet) controller of this type, say Y

	  or M and read the Ethernet-HOWTO, available from

	  <http://www.tldp.org/docs.html#howto>.



	  To compile this driver as a module, choose M here. The module

	  will be called b44.



# Auto-select SSB PCI-HOST support, if possible

config B44_PCI_AUTOSELECT

	bool

	depends on B44 && SSB_PCIHOST_POSSIBLE

	select SSB_PCIHOST

	default y



# Auto-select SSB PCICORE driver, if possible

config B44_PCICORE_AUTOSELECT

	bool

	depends on B44 && SSB_DRIVER_PCICORE_POSSIBLE

	select SSB_DRIVER_PCICORE

	default y



config B44_PCI

	bool

	depends on B44_PCI_AUTOSELECT && B44_PCICORE_AUTOSELECT

	default y



config FORCEDETH

config FORCEDETH

	tristate "nForce Ethernet support"

	tristate "nForce Ethernet support"

	depends on NET_PCI && PCI

	depends on NET_PCI && PCI
@@ -1465,15 +1433,6 @@ config XILINX_EMACLITE 
	help

	help

	  This driver supports the 10/100 Ethernet Lite from Xilinx.

	  This driver supports the 10/100 Ethernet Lite from Xilinx.





config BCM63XX_ENET

	tristate "Broadcom 63xx internal mac support"

	depends on BCM63XX

	select MII

	select PHYLIB

	help

	  This driver supports the ethernet MACs in the Broadcom 63xx

	  MIPS chipset family (BCM63XX).



config FTMAC100

config FTMAC100

	tristate "Faraday FTMAC100 10/100 Ethernet support"

	tristate "Faraday FTMAC100 10/100 Ethernet support"

	depends on ARM

	depends on ARM
@@ -1683,19 +1642,6 @@ config R8169 
	  To compile this driver as a module, choose M here: the module

	  To compile this driver as a module, choose M here: the module

	  will be called r8169.  This is recommended.

	  will be called r8169.  This is recommended.





config SB1250_MAC

	tristate "SB1250 Gigabit Ethernet support"

	depends on SIBYTE_SB1xxx_SOC

	select PHYLIB

	---help---

	  This driver supports Gigabit Ethernet interfaces based on the

	  Broadcom SiByte family of System-On-a-Chip parts.  They include

	  the BCM1120, BCM1125, BCM1125H, BCM1250, BCM1255, BCM1280, BCM1455

	  and BCM1480 chips.



	  To compile this driver as a module, choose M here: the module

	  will be called sb1250-mac.



config SIS190

config SIS190

	tristate "SiS190/SiS191 gigabit ethernet support"

	tristate "SiS190/SiS191 gigabit ethernet support"

	depends on PCI

	depends on PCI
@@ -1789,39 +1735,6 @@ config VIA_VELOCITY 
	  To compile this driver as a module, choose M here. The module

	  To compile this driver as a module, choose M here. The module

	  will be called via-velocity.

	  will be called via-velocity.





config TIGON3

	tristate "Broadcom Tigon3 support"

	depends on PCI

	select PHYLIB

	help

	  This driver supports Broadcom Tigon3 based gigabit Ethernet cards.



	  To compile this driver as a module, choose M here: the module

	  will be called tg3.  This is recommended.



config BNX2

	tristate "Broadcom NetXtremeII support"

	depends on PCI

	select CRC32

	select FW_LOADER

	help

	  This driver supports Broadcom NetXtremeII gigabit Ethernet cards.



	  To compile this driver as a module, choose M here: the module

	  will be called bnx2.  This is recommended.



config CNIC

	tristate "Broadcom CNIC support"

	depends on PCI

	select BNX2

	select UIO

	help

	  This driver supports offload features of Broadcom NetXtremeII

	  gigabit Ethernet cards.



	  To compile this driver as a module, choose M here: the module

	  will be called cnic.  This is recommended.



config SPIDER_NET

config SPIDER_NET

	tristate "Spider Gigabit Ethernet driver"

	tristate "Spider Gigabit Ethernet driver"

	depends on PCI && (PPC_IBM_CELL_BLADE || PPC_CELLEB)

	depends on PCI && (PPC_IBM_CELL_BLADE || PPC_CELLEB)
@@ -2327,18 +2240,6 @@ config TEHUTI 
	help

	help

	  Tehuti Networks 10G Ethernet NIC

	  Tehuti Networks 10G Ethernet NIC





config BNX2X

	tristate "Broadcom NetXtremeII 10Gb support"

	depends on PCI

	select FW_LOADER

	select ZLIB_INFLATE

	select LIBCRC32C

	select MDIO

	help

	  This driver supports Broadcom NetXtremeII 10 gigabit Ethernet cards.

	  To compile this driver as a module, choose M here: the module

	  will be called bnx2x.  This is recommended.



config QLCNIC

config QLCNIC

	tristate "QLOGIC QLCNIC 1/10Gb Converged Ethernet NIC Support"

	tristate "QLOGIC QLCNIC 1/10Gb Converged Ethernet NIC Support"

	depends on PCI

	depends on PCI

drivers/net/Makefile

+0 −7
Original line number Original line Diff line number Diff line
@@ -77,10 +77,6 @@ obj-$(CONFIG_ISERIES_VETH) += iseries_veth.o 
obj-$(CONFIG_NATSEMI) += natsemi.o

obj-$(CONFIG_NATSEMI) += natsemi.o

obj-$(CONFIG_NS83820) += ns83820.o

obj-$(CONFIG_NS83820) += ns83820.o

obj-$(CONFIG_FEALNX) += fealnx.o

obj-$(CONFIG_FEALNX) += fealnx.o

obj-$(CONFIG_TIGON3) += tg3.o

obj-$(CONFIG_BNX2) += bnx2.o

obj-$(CONFIG_CNIC) += cnic.o

obj-$(CONFIG_BNX2X) += bnx2x/

spidernet-y += spider_net.o spider_net_ethtool.o

spidernet-y += spider_net.o spider_net_ethtool.o

obj-$(CONFIG_SPIDER_NET) += spidernet.o sungem_phy.o

obj-$(CONFIG_SPIDER_NET) += spidernet.o sungem_phy.o

obj-$(CONFIG_GELIC_NET) += ps3_gelic.o

obj-$(CONFIG_GELIC_NET) += ps3_gelic.o
@@ -117,10 +113,7 @@ obj-$(CONFIG_FEC_MPC52xx) += fec_mpc52xx.o 
ifeq ($(CONFIG_FEC_MPC52xx_MDIO),y)

ifeq ($(CONFIG_FEC_MPC52xx_MDIO),y)

	obj-$(CONFIG_FEC_MPC52xx) += fec_mpc52xx_phy.o

	obj-$(CONFIG_FEC_MPC52xx) += fec_mpc52xx_phy.o

endif

endif

obj-$(CONFIG_SB1250_MAC) += sb1250-mac.o

obj-$(CONFIG_B44) += b44.o

obj-$(CONFIG_FORCEDETH) += forcedeth.o

obj-$(CONFIG_FORCEDETH) += forcedeth.o

obj-$(CONFIG_BCM63XX_ENET) += bcm63xx_enet.o

obj-$(CONFIG_FTGMAC100) += ftgmac100.o

obj-$(CONFIG_FTGMAC100) += ftgmac100.o

obj-$(CONFIG_FTMAC100) += ftmac100.o

obj-$(CONFIG_FTMAC100) += ftmac100.o

drivers/net/ethernet/Kconfig

+1 −0
Original line number Original line Diff line number Diff line
@@ -14,5 +14,6 @@ if ETHERNET 
source "drivers/net/ethernet/3com/Kconfig"

source "drivers/net/ethernet/3com/Kconfig"

source "drivers/net/ethernet/8390/Kconfig"

source "drivers/net/ethernet/8390/Kconfig"

source "drivers/net/ethernet/amd/Kconfig"

source "drivers/net/ethernet/amd/Kconfig"

source "drivers/net/ethernet/broadcom/Kconfig"





endif # ETHERNET
 
endif # ETHERNET

drivers/net/ethernet/Makefile

+1 −0
Original line number Original line Diff line number Diff line
@@ -5,3 +5,4 @@ 
obj-$(CONFIG_NET_VENDOR_3COM) += 3com/

obj-$(CONFIG_NET_VENDOR_3COM) += 3com/

obj-$(CONFIG_NET_VENDOR_8390) += 8390/

obj-$(CONFIG_NET_VENDOR_8390) += 8390/

obj-$(CONFIG_NET_VENDOR_AMD) += amd/

obj-$(CONFIG_NET_VENDOR_AMD) += amd/

obj-$(CONFIG_NET_VENDOR_BROADCOM) += broadcom/