From 3ac2b4e29ade0497b995abeea4d395dff0144f73 Mon Sep 17 00:00:00 2001 From: juhosg Date: Tue, 21 Feb 2012 09:26:43 +0000 Subject: [PATCH] ramips: move the ethernet driver into a separate directory Also clean up the Kconfig symbols. git-svn-id: svn://svn.openwrt.org/openwrt/trunk@30670 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- .../net/{ => ethernet/ramips}/ramips.c | 0 .../net/{ => ethernet/ramips}/ramips_esw.c | 0 .../net/{ => ethernet/ramips}/ramips_eth.h | 0 .../ramips/patches-3.2/103-ethernet.patch | 50 ++++++++----------- target/linux/ramips/rt288x/config-3.2 | 4 +- target/linux/ramips/rt305x/config-3.2 | 4 +- target/linux/ramips/rt3883/config-3.2 | 4 +- 7 files changed, 26 insertions(+), 36 deletions(-) rename target/linux/ramips/files/drivers/net/{ => ethernet/ramips}/ramips.c (100%) rename target/linux/ramips/files/drivers/net/{ => ethernet/ramips}/ramips_esw.c (100%) rename target/linux/ramips/files/drivers/net/{ => ethernet/ramips}/ramips_eth.h (100%) diff --git a/target/linux/ramips/files/drivers/net/ramips.c b/target/linux/ramips/files/drivers/net/ethernet/ramips/ramips.c similarity index 100% rename from target/linux/ramips/files/drivers/net/ramips.c rename to target/linux/ramips/files/drivers/net/ethernet/ramips/ramips.c diff --git a/target/linux/ramips/files/drivers/net/ramips_esw.c b/target/linux/ramips/files/drivers/net/ethernet/ramips/ramips_esw.c similarity index 100% rename from target/linux/ramips/files/drivers/net/ramips_esw.c rename to target/linux/ramips/files/drivers/net/ethernet/ramips/ramips_esw.c diff --git a/target/linux/ramips/files/drivers/net/ramips_eth.h b/target/linux/ramips/files/drivers/net/ethernet/ramips/ramips_eth.h similarity index 100% rename from target/linux/ramips/files/drivers/net/ramips_eth.h rename to target/linux/ramips/files/drivers/net/ethernet/ramips/ramips_eth.h diff --git a/target/linux/ramips/patches-3.2/103-ethernet.patch b/target/linux/ramips/patches-3.2/103-ethernet.patch index ea244efdc..429dfdc2a 100644 --- a/target/linux/ramips/patches-3.2/103-ethernet.patch +++ b/target/linux/ramips/patches-3.2/103-ethernet.patch @@ -1,30 +1,20 @@ ---- a/drivers/net/Kconfig -+++ b/drivers/net/Kconfig -@@ -277,6 +277,17 @@ source "drivers/net/plip/Kconfig" - - source "drivers/net/ppp/Kconfig" - -+config MIPS_RAMIPS_NET -+ tristate "Ethernet driver for rt288x/rt305x" -+ depends on MIPS_RALINK -+ select PHYLIB if (SOC_RT288X || SOC_RT3883) -+ help -+ This driver supports the etehrnet mac inside the ralink wisocs -+ -+config RAMIPS_ETH_DEBUG -+ bool "Enable debug messages in the Ralink ethernet driver" -+ depends on MIPS_RAMIPS_NET -+ - source "drivers/net/slip/Kconfig" - - source "drivers/s390/net/Kconfig" ---- 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 +--- a/drivers/net/ethernet/Kconfig ++++ b/drivers/net/ethernet/Kconfig +@@ -143,6 +143,7 @@ source "drivers/net/ethernet/packetengin + source "drivers/net/ethernet/pasemi/Kconfig" + source "drivers/net/ethernet/qlogic/Kconfig" + source "drivers/net/ethernet/racal/Kconfig" ++source "drivers/net/ethernet/ramips/Kconfig" + source "drivers/net/ethernet/realtek/Kconfig" + source "drivers/net/ethernet/renesas/Kconfig" + source "drivers/net/ethernet/rdc/Kconfig" +--- a/drivers/net/ethernet/Makefile ++++ b/drivers/net/ethernet/Makefile +@@ -53,6 +53,7 @@ obj-$(CONFIG_NET_PACKET_ENGINE) += packe + obj-$(CONFIG_NET_VENDOR_PASEMI) += pasemi/ + obj-$(CONFIG_NET_VENDOR_QLOGIC) += qlogic/ + obj-$(CONFIG_NET_VENDOR_RACAL) += racal/ ++obj-$(CONFIG_NET_RAMIPS) += ramips/ + obj-$(CONFIG_NET_VENDOR_REALTEK) += realtek/ + obj-$(CONFIG_SH_ETH) += renesas/ + obj-$(CONFIG_NET_VENDOR_RDC) += rdc/ diff --git a/target/linux/ramips/rt288x/config-3.2 b/target/linux/ramips/rt288x/config-3.2 index 1ae35b5bb..2e4596eb0 100644 --- a/target/linux/ramips/rt288x/config-3.2 +++ b/target/linux/ramips/rt288x/config-3.2 @@ -73,7 +73,6 @@ CONFIG_MIPS_L1_CACHE_SHIFT=4 CONFIG_MIPS_MACHINE=y CONFIG_MIPS_MT_DISABLED=y CONFIG_MIPS_RALINK=y -CONFIG_MIPS_RAMIPS_NET=y # CONFIG_MLX4_CORE is not set # CONFIG_MTD_CFI_INTELEXT is not set CONFIG_MTD_CMDLINE_PARTS=y @@ -81,6 +80,8 @@ CONFIG_MTD_CMDLINE_PARTS=y CONFIG_MTD_PHYSMAP=y CONFIG_NEED_DMA_MAP_STATE=y CONFIG_NEED_PER_CPU_KM=y +CONFIG_NET_RAMIPS=y +# CONFIG_NET_RAMIPS_DEBUG is not set CONFIG_PAGEFLAGS_EXTENDED=y CONFIG_PCI=y CONFIG_PCI_DOMAINS=y @@ -93,7 +94,6 @@ CONFIG_RALINK_DEV_GPIO_LEDS=y CONFIG_RALINK_RT288X=y # CONFIG_RALINK_RT305X is not set # CONFIG_RALINK_RT3883 is not set -# CONFIG_RAMIPS_ETH_DEBUG is not set CONFIG_RAMIPS_WDT=y CONFIG_RT288X_MACH_F5D8235_V1=y CONFIG_RT288X_MACH_RT_N15=y diff --git a/target/linux/ramips/rt305x/config-3.2 b/target/linux/ramips/rt305x/config-3.2 index 04706b4c8..dae7d61d8 100644 --- a/target/linux/ramips/rt305x/config-3.2 +++ b/target/linux/ramips/rt305x/config-3.2 @@ -73,13 +73,14 @@ CONFIG_MIPS_L1_CACHE_SHIFT=5 CONFIG_MIPS_MACHINE=y CONFIG_MIPS_MT_DISABLED=y CONFIG_MIPS_RALINK=y -CONFIG_MIPS_RAMIPS_NET=y # CONFIG_MTD_CFI_INTELEXT is not set CONFIG_MTD_CMDLINE_PARTS=y CONFIG_MTD_M25P80=y CONFIG_MTD_PHYSMAP=y CONFIG_NEED_DMA_MAP_STATE=y CONFIG_NEED_PER_CPU_KM=y +CONFIG_NET_RAMIPS=y +# CONFIG_NET_RAMIPS_DEBUG is not set CONFIG_PAGEFLAGS_EXTENDED=y CONFIG_PERF_USE_VMALLOC=y CONFIG_PHYLIB=y @@ -90,7 +91,6 @@ CONFIG_RALINK_DEV_GPIO_LEDS=y # CONFIG_RALINK_RT288X is not set CONFIG_RALINK_RT305X=y # CONFIG_RALINK_RT3883 is not set -# CONFIG_RAMIPS_ETH_DEBUG is not set CONFIG_RAMIPS_WDT=y CONFIG_RT305X_MACH_ALL0256N=y CONFIG_RT305X_MACH_ARGUS_ATP52B=y diff --git a/target/linux/ramips/rt3883/config-3.2 b/target/linux/ramips/rt3883/config-3.2 index 206162dc8..ea43157e1 100644 --- a/target/linux/ramips/rt3883/config-3.2 +++ b/target/linux/ramips/rt3883/config-3.2 @@ -72,13 +72,14 @@ CONFIG_MIPS_L1_CACHE_SHIFT=5 CONFIG_MIPS_MACHINE=y CONFIG_MIPS_MT_DISABLED=y CONFIG_MIPS_RALINK=y -CONFIG_MIPS_RAMIPS_NET=y # CONFIG_MLX4_CORE is not set # CONFIG_MTD_CFI_INTELEXT is not set CONFIG_MTD_CMDLINE_PARTS=y CONFIG_MTD_PHYSMAP=y CONFIG_NEED_DMA_MAP_STATE=y CONFIG_NEED_PER_CPU_KM=y +CONFIG_NET_RAMIPS=y +# CONFIG_NET_RAMIPS_DEBUG is not set CONFIG_PAGEFLAGS_EXTENDED=y CONFIG_PCI=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_RT305X is not set CONFIG_RALINK_RT3883=y -# CONFIG_RAMIPS_ETH_DEBUG is not set CONFIG_RAMIPS_WDT=y CONFIG_RT3883_MACH_RT_N56U=y CONFIG_RTL8366_SMI=y