From b13ad8f498793dc582b7f42f27b8f44490bd608d Mon Sep 17 00:00:00 2001 From: Jeff Kirsher Date: Wed, 15 Jun 2011 11:23:00 -0700 Subject: [PATCH] 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 CC: "David H. Lynch Jr." Signed-off-by: Jeff Kirsher --- drivers/net/Kconfig | 15 -------- drivers/net/Makefile | 4 --- drivers/net/ethernet/Kconfig | 1 + drivers/net/ethernet/Makefile | 1 + drivers/net/ethernet/xilinx/Kconfig | 35 +++++++++++++++++++ drivers/net/ethernet/xilinx/Makefile | 7 ++++ drivers/net/{ => ethernet/xilinx}/ll_temac.h | 0 .../net/{ => ethernet/xilinx}/ll_temac_main.c | 0 .../net/{ => ethernet/xilinx}/ll_temac_mdio.c | 0 .../{ => ethernet/xilinx}/xilinx_emaclite.c | 0 10 files changed, 44 insertions(+), 19 deletions(-) create mode 100644 drivers/net/ethernet/xilinx/Kconfig create mode 100644 drivers/net/ethernet/xilinx/Makefile rename drivers/net/{ => ethernet/xilinx}/ll_temac.h (100%) rename drivers/net/{ => ethernet/xilinx}/ll_temac_main.c (100%) rename drivers/net/{ => ethernet/xilinx}/ll_temac_mdio.c (100%) rename drivers/net/{ => ethernet/xilinx}/xilinx_emaclite.c (100%) diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig index 996bae006fc3..2607a44a270f 100644 --- a/drivers/net/Kconfig +++ b/drivers/net/Kconfig @@ -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 # diff --git a/drivers/net/Makefile b/drivers/net/Makefile index 271fc52138de..4c7af0286ccf 100644 --- a/drivers/net/Makefile +++ b/drivers/net/Makefile @@ -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 diff --git a/drivers/net/ethernet/Kconfig b/drivers/net/ethernet/Kconfig index c29c1457aa9a..922f4d1243a6 100644 --- a/drivers/net/ethernet/Kconfig +++ b/drivers/net/ethernet/Kconfig @@ -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 diff --git a/drivers/net/ethernet/Makefile b/drivers/net/ethernet/Makefile index 8495c507725c..fcecd5f474b4 100644 --- a/drivers/net/ethernet/Makefile +++ b/drivers/net/ethernet/Makefile @@ -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/ 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 + . + + 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 similarity index 100% rename from drivers/net/ll_temac.h rename to 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 similarity index 100% rename from drivers/net/ll_temac_main.c rename to 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 similarity index 100% rename from drivers/net/ll_temac_mdio.c rename to drivers/net/ethernet/xilinx/ll_temac_mdio.c diff --git a/drivers/net/xilinx_emaclite.c b/drivers/net/ethernet/xilinx/xilinx_emaclite.c similarity index 100% rename from drivers/net/xilinx_emaclite.c rename to drivers/net/ethernet/xilinx/xilinx_emaclite.c -- 2.20.1