diff options
author | Lendacky, Thomas <Thomas.Lendacky@amd.com> | 2014-06-05 10:15:18 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2014-06-05 18:26:51 -0400 |
commit | 1ebe98dcd89c624d08a3712a8a9f1706bf213172 (patch) | |
tree | faea505c26915808133023826e16aa15d198990a | |
parent | 4d874b30b14674284d72f92485e991b984b0b5e1 (diff) |
amd-xgbe: Configuration and build support
This patch provides the Kconfig and Makefile changes needed
to configure and build the AMD 10GbE platform driver and the
AMD 10GbE phylib driver.
Signed-off-by: Tom Lendacky <thomas.lendacky@amd.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r-- | drivers/net/ethernet/amd/Kconfig | 14 | ||||
-rw-r--r-- | drivers/net/ethernet/amd/Makefile | 1 | ||||
-rw-r--r-- | drivers/net/phy/Kconfig | 6 | ||||
-rw-r--r-- | drivers/net/phy/Makefile | 1 |
4 files changed, 21 insertions, 1 deletions
diff --git a/drivers/net/ethernet/amd/Kconfig b/drivers/net/ethernet/amd/Kconfig index 562df46e0a82..bbaf36d9f5e1 100644 --- a/drivers/net/ethernet/amd/Kconfig +++ b/drivers/net/ethernet/amd/Kconfig | |||
@@ -7,7 +7,7 @@ config NET_VENDOR_AMD | |||
7 | default y | 7 | default y |
8 | depends on DIO || MACH_DECSTATION || MVME147 || ATARI || SUN3 || \ | 8 | depends on DIO || MACH_DECSTATION || MVME147 || ATARI || SUN3 || \ |
9 | SUN3X || SBUS || PCI || ZORRO || (ISA && ISA_DMA_API) || \ | 9 | SUN3X || SBUS || PCI || ZORRO || (ISA && ISA_DMA_API) || \ |
10 | (ARM && ARCH_EBSA110) || ISA || EISA || PCMCIA | 10 | (ARM && ARCH_EBSA110) || ISA || EISA || PCMCIA || ARM64 |
11 | ---help--- | 11 | ---help--- |
12 | If you have a network (Ethernet) chipset belonging to this class, | 12 | If you have a network (Ethernet) chipset belonging to this class, |
13 | say Y. | 13 | say Y. |
@@ -177,4 +177,16 @@ config SUNLANCE | |||
177 | To compile this driver as a module, choose M here: the module | 177 | To compile this driver as a module, choose M here: the module |
178 | will be called sunlance. | 178 | will be called sunlance. |
179 | 179 | ||
180 | config AMD_XGBE | ||
181 | tristate "AMD 10GbE Ethernet driver" | ||
182 | depends on OF_NET | ||
183 | select PHYLIB | ||
184 | select AMD_XGBE_PHY | ||
185 | ---help--- | ||
186 | This driver supports the AMD 10GbE Ethernet device found on an | ||
187 | AMD SoC. | ||
188 | |||
189 | To compile this driver as a module, choose M here: the module | ||
190 | will be called amd-xgbe. | ||
191 | |||
180 | endif # NET_VENDOR_AMD | 192 | endif # NET_VENDOR_AMD |
diff --git a/drivers/net/ethernet/amd/Makefile b/drivers/net/ethernet/amd/Makefile index cdd4301a973d..a38a2dce3eb3 100644 --- a/drivers/net/ethernet/amd/Makefile +++ b/drivers/net/ethernet/amd/Makefile | |||
@@ -17,3 +17,4 @@ obj-$(CONFIG_NI65) += ni65.o | |||
17 | obj-$(CONFIG_PCNET32) += pcnet32.o | 17 | obj-$(CONFIG_PCNET32) += pcnet32.o |
18 | obj-$(CONFIG_SUN3LANCE) += sun3lance.o | 18 | obj-$(CONFIG_SUN3LANCE) += sun3lance.o |
19 | obj-$(CONFIG_SUNLANCE) += sunlance.o | 19 | obj-$(CONFIG_SUNLANCE) += sunlance.o |
20 | obj-$(CONFIG_AMD_XGBE) += xgbe/ | ||
diff --git a/drivers/net/phy/Kconfig b/drivers/net/phy/Kconfig index 6a17f92153b3..65de0cab8d07 100644 --- a/drivers/net/phy/Kconfig +++ b/drivers/net/phy/Kconfig | |||
@@ -24,6 +24,12 @@ config AMD_PHY | |||
24 | ---help--- | 24 | ---help--- |
25 | Currently supports the am79c874 | 25 | Currently supports the am79c874 |
26 | 26 | ||
27 | config AMD_XGBE_PHY | ||
28 | tristate "Driver for the AMD 10GbE (amd-xgbe) PHYs" | ||
29 | depends on OF | ||
30 | ---help--- | ||
31 | Currently supports the AMD 10GbE PHY | ||
32 | |||
27 | config MARVELL_PHY | 33 | config MARVELL_PHY |
28 | tristate "Drivers for Marvell PHYs" | 34 | tristate "Drivers for Marvell PHYs" |
29 | ---help--- | 35 | ---help--- |
diff --git a/drivers/net/phy/Makefile b/drivers/net/phy/Makefile index 07d24024863e..7dc3d5b304cf 100644 --- a/drivers/net/phy/Makefile +++ b/drivers/net/phy/Makefile | |||
@@ -33,3 +33,4 @@ obj-$(CONFIG_MDIO_BUS_MUX_GPIO) += mdio-mux-gpio.o | |||
33 | obj-$(CONFIG_MDIO_BUS_MUX_MMIOREG) += mdio-mux-mmioreg.o | 33 | obj-$(CONFIG_MDIO_BUS_MUX_MMIOREG) += mdio-mux-mmioreg.o |
34 | obj-$(CONFIG_MDIO_SUN4I) += mdio-sun4i.o | 34 | obj-$(CONFIG_MDIO_SUN4I) += mdio-sun4i.o |
35 | obj-$(CONFIG_MDIO_MOXART) += mdio-moxart.o | 35 | obj-$(CONFIG_MDIO_MOXART) += mdio-moxart.o |
36 | obj-$(CONFIG_AMD_XGBE_PHY) += amd-xgbe-phy.o | ||