Author: blogic
Date: 2014-11-06 10:31:09 +0100 (Thu, 06 Nov 2014)
New Revision: 43195

Modified:
   trunk/target/linux/ramips/files/drivers/net/ethernet/ralink/Kconfig
   trunk/target/linux/ramips/files/drivers/net/ethernet/ralink/Makefile
   trunk/target/linux/ramips/mt7620a/config-3.14
   trunk/target/linux/ramips/mt7620n/config-3.14
Log:
ralink: cleanup ethernet Makefile/Kconfig

Signed-off-by: John Crispin <[email protected]>

Modified: trunk/target/linux/ramips/files/drivers/net/ethernet/ralink/Kconfig
===================================================================
--- trunk/target/linux/ramips/files/drivers/net/ethernet/ralink/Kconfig 
2014-11-06 09:31:03 UTC (rev 43194)
+++ trunk/target/linux/ramips/files/drivers/net/ethernet/ralink/Kconfig 
2014-11-06 09:31:09 UTC (rev 43195)
@@ -1,30 +1,54 @@
 config NET_RALINK
-       tristate "Ralink RT288X/RT3X5X/RT3662/RT3883/MT7620 ethernet driver"
+       tristate "Ralink ethernet driver"
        depends on RALINK
        help
          This driver supports the ethernet mac inside the ralink wisocs
 
 if NET_RALINK
+choice
+       prompt "MAC type"
 
+config NET_RALINK_RT288X
+       bool "RT288X"
+       depends on SOC_RT288X
+
+config NET_RALINK_RT305X
+       bool "RT305X"
+       depends on (SOC_RT305X || SOC_MT7620)
+
+config NET_RALINK_RT3883
+       bool "RT3883"
+       depends on SOC_RT3883
+
+config NET_RALINK_MT7620
+       bool "MT7620"
+       depends on SOC_MT7620
+
+config NET_RALINK_MT7621
+       bool "MT7621"
+       depends on SOC_MT7621
+
+endchoice
+
 config NET_RALINK_MDIO
        def_bool NET_RALINK
-       depends on (SOC_RT288X || SOC_RT3883 || SOC_MT7620)
+       depends on (NET_RALINK_RT288X || NET_RALINK_RT3883 || NET_RALINK_MT7620 
|| NET_RALINK_MT7621)
        select PHYLIB
 
 config NET_RALINK_MDIO_RT2880
        def_bool NET_RALINK
-       depends on (SOC_RT288X || SOC_RT3883)
+       depends on (NET_RALINK_RT288X || NET_RALINK_RT3883)
        select NET_RALINK_MDIO
 
 config NET_RALINK_ESW_RT3052
        def_bool NET_RALINK
-       depends on SOC_RT305X
+       depends on NET_RALINK_RT305X
        select PHYLIB
        select SWCONFIG
 
 config NET_RALINK_GSW_MT7620
        def_bool NET_RALINK
-       depends on SOC_MT7620
+       depends on NET_RALINK_MT7620 || NET_RALINK_MT7621
        select NET_RALINK_MDIO
        select PHYLIB
        select SWCONFIG

Modified: trunk/target/linux/ramips/files/drivers/net/ethernet/ralink/Makefile
===================================================================
--- trunk/target/linux/ramips/files/drivers/net/ethernet/ralink/Makefile        
2014-11-06 09:31:03 UTC (rev 43194)
+++ trunk/target/linux/ramips/files/drivers/net/ethernet/ralink/Makefile        
2014-11-06 09:31:09 UTC (rev 43195)
@@ -10,9 +10,10 @@
 ralink-eth-$(CONFIG_NET_RALINK_ESW_RT3052)     += esw_rt3052.o
 ralink-eth-$(CONFIG_NET_RALINK_GSW_MT7620)     += gsw_mt7620a.o mt7530.o
 
-ralink-eth-$(CONFIG_SOC_RT288X)                        += soc_rt2880.o
-ralink-eth-$(CONFIG_SOC_RT305X)                        += soc_rt305x.o
-ralink-eth-$(CONFIG_SOC_RT3883)                        += soc_rt3883.o
-ralink-eth-$(CONFIG_SOC_MT7620)                        += soc_mt7620.o
+ralink-eth-$(CONFIG_NET_RALINK_RT288X)         += soc_rt2880.o
+ralink-eth-$(CONFIG_NET_RALINK_RT305X)         += soc_rt305x.o
+ralink-eth-$(CONFIG_NET_RALINK_RT3883)         += soc_rt3883.o
+ralink-eth-$(CONFIG_NET_RALINK_MT7620)         += soc_mt7620.o
+ralink-eth-$(CONFIG_NET_RALINK_MT7621)         += soc_mt7621.o
 
 obj-$(CONFIG_NET_RALINK)                       += ralink-eth.o

Modified: trunk/target/linux/ramips/mt7620a/config-3.14
===================================================================
--- trunk/target/linux/ramips/mt7620a/config-3.14       2014-11-06 09:31:03 UTC 
(rev 43194)
+++ trunk/target/linux/ramips/mt7620a/config-3.14       2014-11-06 09:31:09 UTC 
(rev 43195)
@@ -121,6 +121,8 @@
 CONFIG_NET_RALINK=y
 CONFIG_NET_RALINK_GSW_MT7620=y
 CONFIG_NET_RALINK_MDIO=y
+CONFIG_NET_RALINK_MT7620=y
+# CONFIG_NET_RALINK_RT305X is not set
 CONFIG_NLS=m
 CONFIG_NO_GENERIC_PCI_IOPORT_MAP=y
 CONFIG_OF=y

Modified: trunk/target/linux/ramips/mt7620n/config-3.14
===================================================================
--- trunk/target/linux/ramips/mt7620n/config-3.14       2014-11-06 09:31:03 UTC 
(rev 43194)
+++ trunk/target/linux/ramips/mt7620n/config-3.14       2014-11-06 09:31:09 UTC 
(rev 43195)
@@ -119,6 +119,8 @@
 CONFIG_NET_RALINK=y
 CONFIG_NET_RALINK_GSW_MT7620=y
 CONFIG_NET_RALINK_MDIO=y
+CONFIG_NET_RALINK_MT7620=y
+# CONFIG_NET_RALINK_RT305X is not set
 CONFIG_NLS=m
 CONFIG_OF=y
 CONFIG_OF_ADDRESS=y
_______________________________________________
openwrt-commits mailing list
[email protected]
https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-commits

Reply via email to