macb: Move the Atmel driver
Move the Atmel driver into drivers/net/ethernet/cadence/ and make the necessary Kconfig and Makefile changes. CC: Nicolas Ferre <nicolas.ferre@atmel.com> CC: Jamie Iles <jamie@jamieiles.com> Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com> Acked-by: Jamie Iles <jamie@jamieiles.com> Acked-by: Nicolas Ferre <nicolas.ferre@atmel.com>
This commit is contained in:
Jeff Kirsher
parent
7b35f03338
commit
9f2f381f81
|
|
@ -1323,7 +1323,7 @@ F: include/video/atmel_lcdc.h
|
|||
ATMEL MACB ETHERNET DRIVER
|
||||
M: Nicolas Ferre <nicolas.ferre@atmel.com>
|
||||
S: Supported
|
||||
F: drivers/net/macb.*
|
||||
F: drivers/net/ethernet/cadence/
|
||||
|
||||
ATMEL SPI DRIVER
|
||||
M: Nicolas Ferre <nicolas.ferre@atmel.com>
|
||||
|
|
|
|||
|
|
@ -2,9 +2,6 @@
|
|||
# Network device configuration
|
||||
#
|
||||
|
||||
config HAVE_NET_MACB
|
||||
bool
|
||||
|
||||
menuconfig NETDEVICES
|
||||
default y if UML
|
||||
depends on NET
|
||||
|
|
@ -224,19 +221,6 @@ menuconfig NET_ETHERNET
|
|||
|
||||
if NET_ETHERNET
|
||||
|
||||
config MACB
|
||||
tristate "Atmel MACB support"
|
||||
depends on HAVE_NET_MACB
|
||||
select PHYLIB
|
||||
help
|
||||
The Atmel MACB ethernet interface is found on many AT32 and AT91
|
||||
parts. Say Y to include support for the MACB chip.
|
||||
|
||||
To compile this driver as a module, choose M here: the module
|
||||
will be called macb.
|
||||
|
||||
source "drivers/net/arm/Kconfig"
|
||||
|
||||
config SH_ETH
|
||||
tristate "Renesas SuperH Ethernet support"
|
||||
depends on SUPERH && \
|
||||
|
|
|
|||
|
|
@ -63,9 +63,6 @@ obj-$(CONFIG_ETHOC) += ethoc.o
|
|||
obj-$(CONFIG_GRETH) += greth.o
|
||||
|
||||
obj-$(CONFIG_DNET) += dnet.o
|
||||
obj-$(CONFIG_MACB) += macb.o
|
||||
|
||||
obj-$(CONFIG_ARM) += arm/
|
||||
obj-$(CONFIG_DEV_APPLETALK) += appletalk/
|
||||
obj-$(CONFIG_ETHERNET) += ethernet/
|
||||
obj-$(CONFIG_TR) += tokenring/
|
||||
|
|
|
|||
|
|
@ -1,12 +0,0 @@
|
|||
#
|
||||
# Acorn Network device configuration
|
||||
# These are for Acorn's Expansion card network interfaces
|
||||
#
|
||||
|
||||
config ARM_AT91_ETHER
|
||||
tristate "AT91RM9200 Ethernet support"
|
||||
depends on ARM && ARCH_AT91RM9200
|
||||
select MII
|
||||
help
|
||||
If you wish to compile a kernel for the AT91RM9200 and enable
|
||||
ethernet support, then you should always answer Y to this.
|
||||
|
|
@ -1,6 +0,0 @@
|
|||
# File: drivers/net/arm/Makefile
|
||||
#
|
||||
# Makefile for the ARM network device drivers
|
||||
#
|
||||
|
||||
obj-$(CONFIG_ARM_AT91_ETHER) += at91_ether.o
|
||||
|
|
@ -15,6 +15,7 @@ source "drivers/net/ethernet/3com/Kconfig"
|
|||
source "drivers/net/ethernet/amd/Kconfig"
|
||||
source "drivers/net/ethernet/apple/Kconfig"
|
||||
source "drivers/net/ethernet/atheros/Kconfig"
|
||||
source "drivers/net/ethernet/cadence/Kconfig"
|
||||
source "drivers/net/ethernet/adi/Kconfig"
|
||||
source "drivers/net/ethernet/broadcom/Kconfig"
|
||||
source "drivers/net/ethernet/brocade/Kconfig"
|
||||
|
|
|
|||
|
|
@ -7,6 +7,7 @@ obj-$(CONFIG_NET_VENDOR_8390) += 8390/
|
|||
obj-$(CONFIG_NET_VENDOR_AMD) += amd/
|
||||
obj-$(CONFIG_NET_VENDOR_APPLE) += apple/
|
||||
obj-$(CONFIG_NET_VENDOR_ATHEROS) += atheros/
|
||||
obj-$(CONFIG_NET_ATMEL) += cadence/
|
||||
obj-$(CONFIG_NET_BFIN) += adi/
|
||||
obj-$(CONFIG_NET_VENDOR_BROADCOM) += broadcom/
|
||||
obj-$(CONFIG_NET_VENDOR_BROCADE) += brocade/
|
||||
|
|
|
|||
|
|
@ -0,0 +1,44 @@
|
|||
#
|
||||
# Atmel device configuration
|
||||
#
|
||||
|
||||
config HAVE_NET_MACB
|
||||
bool
|
||||
|
||||
config NET_ATMEL
|
||||
bool "Atmel devices"
|
||||
depends on HAVE_NET_MACB || (ARM && ARCH_AT91RM9200)
|
||||
---help---
|
||||
If you have a network (Ethernet) card belonging to this class, say Y.
|
||||
Make sure you know the name of your card. Read the Ethernet-HOWTO,
|
||||
available from <http://www.tldp.org/docs.html#howto>.
|
||||
|
||||
If unsure, say Y.
|
||||
|
||||
Note that the answer to this question doesn't directly affect the
|
||||
kernel: saying N will just cause the configurator to skip all
|
||||
the remaining Atmel network card questions. If you say Y, you will be
|
||||
asked for your specific card in the following questions.
|
||||
|
||||
if NET_ATMEL
|
||||
|
||||
config ARM_AT91_ETHER
|
||||
tristate "AT91RM9200 Ethernet support"
|
||||
depends on ARM && ARCH_AT91RM9200
|
||||
select MII
|
||||
---help---
|
||||
If you wish to compile a kernel for the AT91RM9200 and enable
|
||||
ethernet support, then you should always answer Y to this.
|
||||
|
||||
config MACB
|
||||
tristate "Atmel MACB support"
|
||||
depends on HAVE_NET_MACB
|
||||
select PHYLIB
|
||||
---help---
|
||||
The Atmel MACB ethernet interface is found on many AT32 and AT91
|
||||
parts. Say Y to include support for the MACB chip.
|
||||
|
||||
To compile this driver as a module, choose M here: the module
|
||||
will be called macb.
|
||||
|
||||
endif # NET_ATMEL
|
||||
|
|
@ -0,0 +1,6 @@
|
|||
#
|
||||
# Makefile for the Atmel network device drivers.
|
||||
#
|
||||
|
||||
obj-$(CONFIG_ARM_AT91_ETHER) += at91_ether.o
|
||||
obj-$(CONFIG_MACB) += macb.o
|
||||
Reference in New Issue