mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-08-23 09:19:51 +00:00
xilinx/ll_temac: Move the Xilinx drivers
Move the Xilinx drivers into drivers/net/ethernet/xilinx/ and make the necessary Kconfig and Makefile changes. CC: John Williams <john.williams@petalogix.com> CC: "David H. Lynch Jr." <dhlii@dlasys.net> Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
This commit is contained in:
parent
63d24a0eb7
commit
b13ad8f498
10 changed files with 44 additions and 19 deletions
|
@ -493,13 +493,6 @@ config NET_POCKET
|
|||
the questions about this class of network devices. If you say Y, you
|
||||
will be asked for your specific device in the following questions.
|
||||
|
||||
config XILINX_EMACLITE
|
||||
tristate "Xilinx 10/100 Ethernet Lite support"
|
||||
depends on PPC32 || MICROBLAZE
|
||||
select PHYLIB
|
||||
help
|
||||
This driver supports the 10/100 Ethernet Lite from Xilinx.
|
||||
|
||||
config LANTIQ_ETOP
|
||||
tristate "Lantiq SoC ETOP driver"
|
||||
depends on SOC_TYPE_XWAY
|
||||
|
@ -539,14 +532,6 @@ config IP1000
|
|||
To compile this driver as a module, choose M here: the module
|
||||
will be called ipg. This is recommended.
|
||||
|
||||
config XILINX_LL_TEMAC
|
||||
tristate "Xilinx LL TEMAC (LocalLink Tri-mode Ethernet MAC) driver"
|
||||
depends on PPC || MICROBLAZE
|
||||
select PHYLIB
|
||||
help
|
||||
This driver supports the Xilinx 10/100/1000 LocalLink TEMAC
|
||||
core used in Xilinx Spartan and Virtex FPGAs
|
||||
|
||||
endif # NETDEV_1000
|
||||
|
||||
#
|
||||
|
|
|
@ -33,10 +33,6 @@ obj-$(CONFIG_NET_SB1000) += sb1000.o
|
|||
obj-$(CONFIG_HP100) += hp100.o
|
||||
obj-$(CONFIG_FORCEDETH) += forcedeth.o
|
||||
|
||||
ll_temac-objs := ll_temac_main.o ll_temac_mdio.o
|
||||
obj-$(CONFIG_XILINX_LL_TEMAC) += ll_temac.o
|
||||
obj-$(CONFIG_XILINX_EMACLITE) += xilinx_emaclite.o
|
||||
|
||||
obj-$(CONFIG_PPP) += ppp_generic.o
|
||||
obj-$(CONFIG_PPP_ASYNC) += ppp_async.o
|
||||
obj-$(CONFIG_PPP_SYNC_TTY) += ppp_synctty.o
|
||||
|
|
|
@ -82,5 +82,6 @@ source "drivers/net/ethernet/ti/Kconfig"
|
|||
source "drivers/net/ethernet/toshiba/Kconfig"
|
||||
source "drivers/net/ethernet/tundra/Kconfig"
|
||||
source "drivers/net/ethernet/via/Kconfig"
|
||||
source "drivers/net/ethernet/xilinx/Kconfig"
|
||||
|
||||
endif # ETHERNET
|
||||
|
|
|
@ -50,3 +50,4 @@ obj-$(CONFIG_NET_VENDOR_TI) += ti/
|
|||
obj-$(CONFIG_NET_VENDOR_TOSHIBA) += toshiba/
|
||||
obj-$(CONFIG_NET_VENDOR_TUNDRA) += tundra/
|
||||
obj-$(CONFIG_NET_VENDOR_VIA) += via/
|
||||
obj-$(CONFIG_NET_VENDOR_XILINX) += xilinx/
|
||||
|
|
35
drivers/net/ethernet/xilinx/Kconfig
Normal file
35
drivers/net/ethernet/xilinx/Kconfig
Normal file
|
@ -0,0 +1,35 @@
|
|||
#
|
||||
# Xilink device configuration
|
||||
#
|
||||
|
||||
config NET_VENDOR_XILINX
|
||||
bool "Xilinx devices"
|
||||
depends on PPC || PPC32 || MICROBLAZE
|
||||
---help---
|
||||
If you have a network (Ethernet) card belonging to this class, say Y
|
||||
and read the Ethernet-HOWTO, available from
|
||||
<http://www.tldp.org/docs.html#howto>.
|
||||
|
||||
Note that the answer to this question doesn't directly affect the
|
||||
kernel: saying N will just cause the configurator to skip all
|
||||
the questions about Xilinx devices. If you say Y, you will be asked
|
||||
for your specific card in the following questions.
|
||||
|
||||
if NET_VENDOR_XILINX
|
||||
|
||||
config XILINX_EMACLITE
|
||||
tristate "Xilinx 10/100 Ethernet Lite support"
|
||||
depends on (PPC32 || MICROBLAZE)
|
||||
select PHYLIB
|
||||
---help---
|
||||
This driver supports the 10/100 Ethernet Lite from Xilinx.
|
||||
|
||||
config XILINX_LL_TEMAC
|
||||
tristate "Xilinx LL TEMAC (LocalLink Tri-mode Ethernet MAC) driver"
|
||||
depends on (PPC || MICROBLAZE)
|
||||
select PHYLIB
|
||||
---help---
|
||||
This driver supports the Xilinx 10/100/1000 LocalLink TEMAC
|
||||
core used in Xilinx Spartan and Virtex FPGAs
|
||||
|
||||
endif # NET_VENDOR_XILINX
|
7
drivers/net/ethernet/xilinx/Makefile
Normal file
7
drivers/net/ethernet/xilinx/Makefile
Normal file
|
@ -0,0 +1,7 @@
|
|||
#
|
||||
# Makefile for the Xilink network device drivers.
|
||||
#
|
||||
|
||||
ll_temac-objs := ll_temac_main.o ll_temac_mdio.o
|
||||
obj-$(CONFIG_XILINX_LL_TEMAC) += ll_temac.o
|
||||
obj-$(CONFIG_XILINX_EMACLITE) += xilinx_emaclite.o
|
Loading…
Reference in a new issue