ramips: fix edimax 6200nl switch config

[openwrt/openwrt.git] / target / linux / ramips / base-files / etc / board.d / 02_network

diff --git a/target/linux/ramips/base-files/etc/board.d/02_network b/target/linux/ramips/base-files/etc/board.d/02_network
index 4728c75312ee75842dbda94b41553a7de52fd538..0400e58cdac404668d005e214c0154e3b5dc2e3f 100755 (executable)
--- a/target/linux/ramips/base-files/etc/board.d/02_network
+++ b/target/linux/ramips/base-files/etc/board.d/02_network
@@ -24,8 +24,7 @@ ramips_setup_rt3x5x_vlans()
                        lanports="$port:lan $lanports"
                fi
        done
-       ucidef_set_interfaces_lan_wan "eth0.1" "eth0.2"
-       ucidef_add_switch "rt305x" $lanports $wanports "6@eth0"
+       ucidef_add_switch "rt305x" $lanports $wanports "6t@eth0"
 }
 
 ramips_setup_interfaces()
@@ -49,15 +48,16 @@ ramips_setup_interfaces()
        microwrt|\
        mpr-a2|\
        ncs601w|\
+       timecloud|\
        w150m|\
        widora-neo|\
        wnce2001|\
+       zbt-cpe102|\
        zte-q7)
                ucidef_add_switch "switch0"
                ucidef_add_switch_attr "switch0" "enable" "false"
                ucidef_set_interface_lan "eth0"
                ;;
-       3g-6200nl|\
        mlw221|\
        mr-102n)
                ucidef_set_interface_lan "eth0.2"
@@ -71,15 +71,18 @@ ramips_setup_interfaces()
        dir-615-h1|\
        firewrt|\
        hlk-rm04|\
+       mac1200rv2|\
        miwifi-mini|\
        miwifi-nano|\
        mt7621|\
        mt7628|\
        mzk-750dhp|\
        mzk-w300nh2|\
+       nixcore|\
        oy-0001|\
        pbr-m1|\
        psg1208|\
+       psg1218|\
        sap-g3200u3|\
        sk-wb8|\
        wf-2881|\
@@ -91,9 +94,12 @@ ramips_setup_interfaces()
        wsr-600|\
        wt1520|\
        y1|\
+       youku-yk1|\
+       zbt-ape522ii|\
+       zbt-we826|\
        zbt-wg2626|\
        zbt-wg3526|\
-       youku-yk1)
+       zbt-wr8305rt)
                ucidef_add_switch "switch0" \
                        "0:lan" "1:lan" "2:lan" "3:lan" "4:wan" "6@eth0"
                ;;
@@ -113,6 +119,8 @@ ramips_setup_interfaces()
        atp-52b|\
        awm002-evb|\
        awm003-evb|\
+       c20i|\
+       c50|\
        dir-645|\
        dir-860l-b1|\
        f5d8235-v1|\
@@ -121,10 +129,10 @@ ramips_setup_interfaces()
        gl-mt300n|\
        gl-mt750|\
        hg255d|\
-       mzk-wdpr|\
        jhr-n805r|\
        jhr-n825r|\
        jhr-n926r|\
+       mzk-wdpr|\
        rt-n14u|\
        ubnt-erx|\
        ur-326n4g|\
@@ -164,14 +172,21 @@ ramips_setup_interfaces()
                ;;
        cs-qr10|\
        d105|\
+       dch-m225|\
        hpm|\
        mzk-ex300np|\
        mzk-ex750np|\
        na930|\
+       pbr-d1|\
        wli-tx4-ag300n|\
+       wmr-300|\
        wrh-300cr)
                ucidef_set_interface_lan "eth0"
                ;;
+       duzun-dm06)
+               ucidef_add_switch "switch0" \
+                       "1:lan" "0:wan" "6@eth0"
+               ;;
        e1700|\
        mt7620a_mt7530)
                ucidef_add_switch "switch1" \
@@ -184,8 +199,7 @@ ramips_setup_interfaces()
                ;;
        mlwg2|\
        wizard8800|\
-       wl-330n|\
-       wmr-300)
+       wl-330n)
                ucidef_set_interface_lan "eth0.1"
                ;;
        mzk-dp150n|\
@@ -193,6 +207,13 @@ ramips_setup_interfaces()
                ucidef_add_switch "switch0" \
                        "0:lan" "4:lan" "6t@eth0"
                ;;
+       newifi-d1)
+               ucidef_set_interface_lan_wan "eth0.1" "eth0.2"
+               ucidef_add_switch "switch0" \
+                       "0:lan" "1:lan" "2:lan" "3:lan" "5:wan" "6t@eth0" "7t@eth0"
+               ucidef_add_switch "switch1" \
+                       "4:lan" "6t@eth0" "7t@eth0"
+               ;;
        rt-n56u)
                ucidef_add_switch "switch0" \
                        "0:lan" "1:lan" "2:lan" "3:lan" "4:wan" "8@eth0"
@@ -202,6 +223,7 @@ ramips_setup_interfaces()
                ucidef_add_switch "switch0" \
                        "1:lan" "2:lan" "3:lan" "4:lan" "5:wan" "0@eth0"
                ;;
+       tew-714tru|\
        v11st-fe|\
        wzr-agl300nh)
                ucidef_add_switch "switch0" \
@@ -219,11 +241,6 @@ ramips_setup_interfaces()
                ucidef_add_switch "switch0" \
                        "1:lan" "2:lan" "0:wan" "6@eth0"
                ;;
-       zbt-we826|\
-       zbt-wr8305rt)
-               ucidef_add_switch "switch0" \
-                       "0:lan" "1:lan" "2:lan" "3:lan" "4:wan" "6@eth0"
-               ;;
        *)
                RT3X5X=`cat /proc/cpuinfo | egrep "(RT3.5|RT5350)"`
                if [ -n "${RT3X5X}" ]; then
@@ -276,10 +293,17 @@ ramips_setup_macs()
                wan_mac=$(mtd_get_mac_binary devdata 7)
                ;;
        cy-swr1100|\
+       dch-m225)
+               lan_mac=$(mtd_get_mac_ascii factory lanmac)
+               ;;
        dir-645)
                lan_mac=$(mtd_get_mac_ascii nvram lanmac)
                wan_mac=$(mtd_get_mac_ascii nvram wanmac)
                ;;
+       dir-860l-b1)
+               lan_mac=$(mtd_get_mac_ascii factory lanmac)
+               wan_mac=$(mtd_get_mac_ascii factory wanmac)
+               ;;
        e1700)
                wan_mac=$(mtd_get_mac_ascii config WAN_MAC_ADDR)
                ;;
@@ -293,6 +317,10 @@ ramips_setup_macs()
                wan_mac=$(mtd_get_mac_binary factory 4)
                lan_mac=$(mtd_get_mac_binary factory 46)
                ;;
+       mac1200rv2)
+               lan_mac=$(mtd_get_mac_binary factory_info 13)
+               wan_mac=$(macaddr_add "$lan_mac" 1)
+               ;;
        m3|\
        m4|\
        x5|\
@@ -300,6 +328,10 @@ ramips_setup_macs()
                lan_mac=$(cat /sys/class/net/eth0/address)
                lan_mac=$(macaddr_add "$lan_mac" -2)
                ;;
+       newifi-d1)
+               lan_mac=$(cat /sys/class/net/eth0/address)
+               lan_mac=$(macaddr_add "$lan_mac" 2)
+               ;;
        oy-0001)
                lan_mac=$(mtd_get_mac_binary factory 40)
                wan_mac=$(mtd_get_mac_binary factory 46)
@@ -313,12 +345,10 @@ ramips_setup_macs()
                wan_mac=$(mtd_get_mac_binary factory 57350)
                ;;
        tew-691gr)
-               lan_mac=$(cat /sys/class/net/eth0/address)
-               wan_mac=$(macaddr_add "$lan_mac" 3)
+               wan_mac=$(macaddr_add "$(mtd_get_mac_binary factory 4)" 3)
                ;;
        tew-692gr)
-               lan_mac=$(cat /sys/class/net/eth0/address)
-               wan_mac=$(macaddr_add "$lan_mac" 4)
+               wan_mac=$(macaddr_add "$(mtd_get_mac_binary factory 4)" 1)
                ;;
        tiny-ac)
                lan_mac=$(mtd_get_mac_ascii u-boot-env LAN_MAC_ADDR)
@@ -353,8 +383,8 @@ ramips_setup_macs()
                ;;
        esac
 
-       [ -n "$lan_mac" ] && ucidef_set_interface_macaddr lan $lan_mac
-       [ -n "$wan_mac" ] && ucidef_set_interface_macaddr wan $wan_mac
+       [ -n "$lan_mac" ] && ucidef_set_interface_macaddr "lan" $lan_mac
+       [ -n "$wan_mac" ] && ucidef_set_interface_macaddr "wan" $wan_mac
 }
 
 board_config_update