ramips: move the ethernet driver into a separate directory

Also clean up the Kconfig symbols.

SVN-Revision: 30670
This commit is contained in:
Gabor Juhos 2012-02-21 09:26:43 +00:00
parent a6d904b1d6
commit 3ba0f4e1ca
7 changed files with 26 additions and 36 deletions

View File

@ -1,30 +1,20 @@
--- a/drivers/net/Kconfig --- a/drivers/net/ethernet/Kconfig
+++ b/drivers/net/Kconfig +++ b/drivers/net/ethernet/Kconfig
@@ -277,6 +277,17 @@ source "drivers/net/plip/Kconfig" @@ -143,6 +143,7 @@ source "drivers/net/ethernet/packetengin
source "drivers/net/ethernet/pasemi/Kconfig"
source "drivers/net/ppp/Kconfig" source "drivers/net/ethernet/qlogic/Kconfig"
source "drivers/net/ethernet/racal/Kconfig"
+config MIPS_RAMIPS_NET +source "drivers/net/ethernet/ramips/Kconfig"
+ tristate "Ethernet driver for rt288x/rt305x" source "drivers/net/ethernet/realtek/Kconfig"
+ depends on MIPS_RALINK source "drivers/net/ethernet/renesas/Kconfig"
+ select PHYLIB if (SOC_RT288X || SOC_RT3883) source "drivers/net/ethernet/rdc/Kconfig"
+ help --- a/drivers/net/ethernet/Makefile
+ This driver supports the etehrnet mac inside the ralink wisocs +++ b/drivers/net/ethernet/Makefile
+ @@ -53,6 +53,7 @@ obj-$(CONFIG_NET_PACKET_ENGINE) += packe
+config RAMIPS_ETH_DEBUG obj-$(CONFIG_NET_VENDOR_PASEMI) += pasemi/
+ bool "Enable debug messages in the Ralink ethernet driver" obj-$(CONFIG_NET_VENDOR_QLOGIC) += qlogic/
+ depends on MIPS_RAMIPS_NET obj-$(CONFIG_NET_VENDOR_RACAL) += racal/
+ +obj-$(CONFIG_NET_RAMIPS) += ramips/
source "drivers/net/slip/Kconfig" obj-$(CONFIG_NET_VENDOR_REALTEK) += realtek/
obj-$(CONFIG_SH_ETH) += renesas/
source "drivers/s390/net/Kconfig" obj-$(CONFIG_NET_VENDOR_RDC) += rdc/
--- a/drivers/net/Makefile
+++ b/drivers/net/Makefile
@@ -44,6 +44,7 @@ obj-$(CONFIG_PPP_SYNC_TTY) += ppp/
obj-$(CONFIG_PPPOE) += ppp/
obj-$(CONFIG_PPPOL2TP) += ppp/
obj-$(CONFIG_PPTP) += ppp/
+obj-$(CONFIG_MIPS_RAMIPS_NET) += ramips.o
obj-$(CONFIG_SLIP) += slip/
obj-$(CONFIG_SLHC) += slip/
obj-$(CONFIG_NET_SB1000) += sb1000.o

View File

@ -73,7 +73,6 @@ CONFIG_MIPS_L1_CACHE_SHIFT=4
CONFIG_MIPS_MACHINE=y CONFIG_MIPS_MACHINE=y
CONFIG_MIPS_MT_DISABLED=y CONFIG_MIPS_MT_DISABLED=y
CONFIG_MIPS_RALINK=y CONFIG_MIPS_RALINK=y
CONFIG_MIPS_RAMIPS_NET=y
# CONFIG_MLX4_CORE is not set # CONFIG_MLX4_CORE is not set
# CONFIG_MTD_CFI_INTELEXT is not set # CONFIG_MTD_CFI_INTELEXT is not set
CONFIG_MTD_CMDLINE_PARTS=y CONFIG_MTD_CMDLINE_PARTS=y
@ -81,6 +80,8 @@ CONFIG_MTD_CMDLINE_PARTS=y
CONFIG_MTD_PHYSMAP=y CONFIG_MTD_PHYSMAP=y
CONFIG_NEED_DMA_MAP_STATE=y CONFIG_NEED_DMA_MAP_STATE=y
CONFIG_NEED_PER_CPU_KM=y CONFIG_NEED_PER_CPU_KM=y
CONFIG_NET_RAMIPS=y
# CONFIG_NET_RAMIPS_DEBUG is not set
CONFIG_PAGEFLAGS_EXTENDED=y CONFIG_PAGEFLAGS_EXTENDED=y
CONFIG_PCI=y CONFIG_PCI=y
CONFIG_PCI_DOMAINS=y CONFIG_PCI_DOMAINS=y
@ -93,7 +94,6 @@ CONFIG_RALINK_DEV_GPIO_LEDS=y
CONFIG_RALINK_RT288X=y CONFIG_RALINK_RT288X=y
# CONFIG_RALINK_RT305X is not set # CONFIG_RALINK_RT305X is not set
# CONFIG_RALINK_RT3883 is not set # CONFIG_RALINK_RT3883 is not set
# CONFIG_RAMIPS_ETH_DEBUG is not set
CONFIG_RAMIPS_WDT=y CONFIG_RAMIPS_WDT=y
CONFIG_RT288X_MACH_F5D8235_V1=y CONFIG_RT288X_MACH_F5D8235_V1=y
CONFIG_RT288X_MACH_RT_N15=y CONFIG_RT288X_MACH_RT_N15=y

View File

@ -73,13 +73,14 @@ CONFIG_MIPS_L1_CACHE_SHIFT=5
CONFIG_MIPS_MACHINE=y CONFIG_MIPS_MACHINE=y
CONFIG_MIPS_MT_DISABLED=y CONFIG_MIPS_MT_DISABLED=y
CONFIG_MIPS_RALINK=y CONFIG_MIPS_RALINK=y
CONFIG_MIPS_RAMIPS_NET=y
# CONFIG_MTD_CFI_INTELEXT is not set # CONFIG_MTD_CFI_INTELEXT is not set
CONFIG_MTD_CMDLINE_PARTS=y CONFIG_MTD_CMDLINE_PARTS=y
CONFIG_MTD_M25P80=y CONFIG_MTD_M25P80=y
CONFIG_MTD_PHYSMAP=y CONFIG_MTD_PHYSMAP=y
CONFIG_NEED_DMA_MAP_STATE=y CONFIG_NEED_DMA_MAP_STATE=y
CONFIG_NEED_PER_CPU_KM=y CONFIG_NEED_PER_CPU_KM=y
CONFIG_NET_RAMIPS=y
# CONFIG_NET_RAMIPS_DEBUG is not set
CONFIG_PAGEFLAGS_EXTENDED=y CONFIG_PAGEFLAGS_EXTENDED=y
CONFIG_PERF_USE_VMALLOC=y CONFIG_PERF_USE_VMALLOC=y
CONFIG_PHYLIB=y CONFIG_PHYLIB=y
@ -90,7 +91,6 @@ CONFIG_RALINK_DEV_GPIO_LEDS=y
# CONFIG_RALINK_RT288X is not set # CONFIG_RALINK_RT288X is not set
CONFIG_RALINK_RT305X=y CONFIG_RALINK_RT305X=y
# CONFIG_RALINK_RT3883 is not set # CONFIG_RALINK_RT3883 is not set
# CONFIG_RAMIPS_ETH_DEBUG is not set
CONFIG_RAMIPS_WDT=y CONFIG_RAMIPS_WDT=y
CONFIG_RT305X_MACH_ALL0256N=y CONFIG_RT305X_MACH_ALL0256N=y
CONFIG_RT305X_MACH_ARGUS_ATP52B=y CONFIG_RT305X_MACH_ARGUS_ATP52B=y

View File

@ -72,13 +72,14 @@ CONFIG_MIPS_L1_CACHE_SHIFT=5
CONFIG_MIPS_MACHINE=y CONFIG_MIPS_MACHINE=y
CONFIG_MIPS_MT_DISABLED=y CONFIG_MIPS_MT_DISABLED=y
CONFIG_MIPS_RALINK=y CONFIG_MIPS_RALINK=y
CONFIG_MIPS_RAMIPS_NET=y
# CONFIG_MLX4_CORE is not set # CONFIG_MLX4_CORE is not set
# CONFIG_MTD_CFI_INTELEXT is not set # CONFIG_MTD_CFI_INTELEXT is not set
CONFIG_MTD_CMDLINE_PARTS=y CONFIG_MTD_CMDLINE_PARTS=y
CONFIG_MTD_PHYSMAP=y CONFIG_MTD_PHYSMAP=y
CONFIG_NEED_DMA_MAP_STATE=y CONFIG_NEED_DMA_MAP_STATE=y
CONFIG_NEED_PER_CPU_KM=y CONFIG_NEED_PER_CPU_KM=y
CONFIG_NET_RAMIPS=y
# CONFIG_NET_RAMIPS_DEBUG is not set
CONFIG_PAGEFLAGS_EXTENDED=y CONFIG_PAGEFLAGS_EXTENDED=y
CONFIG_PCI=y CONFIG_PCI=y
CONFIG_PCI_DISABLE_COMMON_QUIRKS=y CONFIG_PCI_DISABLE_COMMON_QUIRKS=y
@ -92,7 +93,6 @@ CONFIG_RALINK_DEV_GPIO_LEDS=y
# CONFIG_RALINK_RT288X is not set # CONFIG_RALINK_RT288X is not set
# CONFIG_RALINK_RT305X is not set # CONFIG_RALINK_RT305X is not set
CONFIG_RALINK_RT3883=y CONFIG_RALINK_RT3883=y
# CONFIG_RAMIPS_ETH_DEBUG is not set
CONFIG_RAMIPS_WDT=y CONFIG_RAMIPS_WDT=y
CONFIG_RT3883_MACH_RT_N56U=y CONFIG_RT3883_MACH_RT_N56U=y
CONFIG_RTL8366_SMI=y CONFIG_RTL8366_SMI=y