diff options
author | 2011-06-15 11:23:00 -0700 | |
---|---|---|
committer | 2011-08-12 03:41:30 -0700 | |
commit | b13ad8f498793dc582b7f42f27b8f44490bd608d (patch) | |
tree | d0a1acf3e2d89fbc3bbf0d11fd2b60a41057a55c /drivers/net/ethernet/xilinx | |
parent | jme: Move the JME driver (diff) | |
download | linux-dev-b13ad8f498793dc582b7f42f27b8f44490bd608d.tar.xz linux-dev-b13ad8f498793dc582b7f42f27b8f44490bd608d.zip |
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>
Diffstat (limited to '')
-rw-r--r-- | drivers/net/ethernet/xilinx/Kconfig | 35 | ||||
-rw-r--r-- | drivers/net/ethernet/xilinx/Makefile | 7 | ||||
-rw-r--r-- | drivers/net/ethernet/xilinx/ll_temac.h (renamed from drivers/net/ll_temac.h) | 0 | ||||
-rw-r--r-- | drivers/net/ethernet/xilinx/ll_temac_main.c (renamed from drivers/net/ll_temac_main.c) | 0 | ||||
-rw-r--r-- | drivers/net/ethernet/xilinx/ll_temac_mdio.c (renamed from drivers/net/ll_temac_mdio.c) | 0 | ||||
-rw-r--r-- | drivers/net/ethernet/xilinx/xilinx_emaclite.c (renamed from drivers/net/xilinx_emaclite.c) | 0 |
6 files changed, 42 insertions, 0 deletions
diff --git a/drivers/net/ethernet/xilinx/Kconfig b/drivers/net/ethernet/xilinx/Kconfig new file mode 100644 index 000000000000..4e3aad401cd8 --- /dev/null +++ b/drivers/net/ethernet/xilinx/Kconfig @@ -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 diff --git a/drivers/net/ethernet/xilinx/Makefile b/drivers/net/ethernet/xilinx/Makefile new file mode 100644 index 000000000000..5feac734ea45 --- /dev/null +++ b/drivers/net/ethernet/xilinx/Makefile @@ -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 diff --git a/drivers/net/ll_temac.h b/drivers/net/ethernet/xilinx/ll_temac.h index 522abe2ff25a..522abe2ff25a 100644 --- a/drivers/net/ll_temac.h +++ b/drivers/net/ethernet/xilinx/ll_temac.h diff --git a/drivers/net/ll_temac_main.c b/drivers/net/ethernet/xilinx/ll_temac_main.c index 728fe414147a..728fe414147a 100644 --- a/drivers/net/ll_temac_main.c +++ b/drivers/net/ethernet/xilinx/ll_temac_main.c diff --git a/drivers/net/ll_temac_mdio.c b/drivers/net/ethernet/xilinx/ll_temac_mdio.c index 8cf9d4f56bb2..8cf9d4f56bb2 100644 --- a/drivers/net/ll_temac_mdio.c +++ b/drivers/net/ethernet/xilinx/ll_temac_mdio.c diff --git a/drivers/net/xilinx_emaclite.c b/drivers/net/ethernet/xilinx/xilinx_emaclite.c index 8018d7d045b0..8018d7d045b0 100644 --- a/drivers/net/xilinx_emaclite.c +++ b/drivers/net/ethernet/xilinx/xilinx_emaclite.c |