ramips: correct keenetic-series switch index

[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 32bfa77f70e39f1a3c6cdc942e7fbe53557b1526..bcb9509a36f4a8686bf4a5c5686ebbb6204c884f 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()
@@ -33,6 +32,11 @@ ramips_setup_interfaces()
        local board="$1"
 
        case $board in
+       11acnas|\
+       w2914nsv2)
+               ucidef_add_switch "switch0" \
+                       "0:lan:4" "1:lan:3" "2:lan:2" "3:lan:1" "4:wan:5" "6@eth0"
+               ;;
        3g150b|\
        3g300m|\
        a5-v11|\
@@ -49,21 +53,25 @@ ramips_setup_interfaces()
        microwrt|\
        mpr-a2|\
        ncs601w|\
+       omega2 | \
+       omega2p | \
        timecloud|\
        w150m|\
        widora-neo|\
+       wn3000rpv3|\
        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"
                ;;
        3g-6200n|\
+       ac1200pro|\
        ai-br100|\
        db-wrt01|\
        dir-300-b7|\
@@ -72,6 +80,7 @@ ramips_setup_interfaces()
        dir-615-h1|\
        firewrt|\
        hlk-rm04|\
+       mac1200rv2|\
        miwifi-mini|\
        miwifi-nano|\
        mt7621|\
@@ -82,23 +91,32 @@ ramips_setup_interfaces()
        oy-0001|\
        pbr-m1|\
        psg1208|\
+       psg1218|\
        sap-g3200u3|\
        sk-wb8|\
+       vr500|\
        wf-2881|\
-       whr-300hp2|\
-       whr-600d|\
        witi|\
+       wl-wn575a3|\
        wndr3700v5|\
-       wsr-1166|\
-       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"
                ;;
+       whr-300hp2|\
+       whr-600d|\
+       wsr-1166|\
+       wsr-600)
+               ucidef_add_switch "switch0" \
+                       "0:lan:1" "1:lan:2" "2:lan:3" "3:lan:4" "4:wan:5" "6@eth0"
+               ;;
        ar670w|\
        ar725w|\
        rt-n15|\
@@ -107,7 +125,6 @@ ramips_setup_interfaces()
                        "0:lan" "1:lan" "2:lan" "3:lan" "4:wan" "5@eth0"
                ;;
        asl26555|\
-       re6500|\
        rp-n53)
                ucidef_add_switch "switch0" \
                        "1:lan" "2:lan" "3:lan" "4:lan" "6t@eth0"
@@ -119,16 +136,16 @@ ramips_setup_interfaces()
        c50|\
        dir-645|\
        dir-860l-b1|\
-       f5d8235-v1|\
        f5d8235-v2|\
        gl-mt300a|\
        gl-mt300n|\
        gl-mt750|\
        hg255d|\
-       mzk-wdpr|\
        jhr-n805r|\
        jhr-n825r|\
        jhr-n926r|\
+       mzk-wdpr|\
+       rb750gr3|\
        rt-n14u|\
        ubnt-erx|\
        ur-326n4g|\
@@ -173,7 +190,10 @@ ramips_setup_interfaces()
        mzk-ex300np|\
        mzk-ex750np|\
        na930|\
+       pbr-d1|\
        wli-tx4-ag300n|\
+       wmr-300|\
+       wn3000rpv3|\
        wrh-300cr)
                ucidef_set_interface_lan "eth0"
                ;;
@@ -191,28 +211,53 @@ ramips_setup_interfaces()
                ucidef_add_switch "switch0" \
                        "1:lan" "2:lan" "3:lan" "4:lan" "5:lan" "0:wan" "6@eth0"
                ;;
+       kn_rc|\
+       kn_rf)
+               ucidef_add_switch "switch0" \
+                       "0:wan" "1:lan" "2:lan" "3:lan" "4:lan" "6@eth0"
+               ;;
+       kng_rc)
+               ucidef_add_switch "switch1" \
+                       "0:lan" "1:lan" "2:lan" "3:lan" "4:wan" "7t@eth0"
+               ;;
        mlwg2|\
        wizard8800|\
        wl-330n)
                ucidef_set_interface_lan "eth0.1"
                ;;
-       wmr-300)
-               ucidef_set_interface_lan "eth0"
+       mr200)
+               ucidef_add_switch "switch0" \
+                       "0:lan" "1:lan" "2:lan" "3:lan" "6t@eth0"
+               ucidef_set_interface_wan "usb0"
                ;;
        mzk-dp150n|\
        vocore)
                ucidef_add_switch "switch0" \
                        "0:lan" "4:lan" "6t@eth0"
                ;;
+       newifi-d1)
+               ucidef_add_switch "switch0" \
+               "1:lan:2" "2:lan:1" "4:wan" "6@eth0"
+               ;;
+       re6500)
+               ucidef_add_switch "switch0" \
+                       "0:lan:1" "1:lan:2" "2:lan:3" "3:lan:4" "6@eth0"
+               ;;
        rt-n56u)
                ucidef_add_switch "switch0" \
                        "0:lan" "1:lan" "2:lan" "3:lan" "4:wan" "8@eth0"
                ;;
        tew-691gr|\
-       tew-692gr)
+       tew-692gr|\
+       wlr-6000)
                ucidef_add_switch "switch0" \
                        "1:lan" "2:lan" "3:lan" "4:lan" "5:wan" "0@eth0"
                ;;
+       vocore2)
+               ucidef_add_switch "switch0" \
+                       "0:lan" "2:lan" "6t@eth0"
+               ;;
+       f5d8235-v1|\
        tew-714tru|\
        v11st-fe|\
        wzr-agl300nh)
@@ -231,12 +276,6 @@ ramips_setup_interfaces()
                ucidef_add_switch "switch0" \
                        "1:lan" "2:lan" "0:wan" "6@eth0"
                ;;
-       zbt-ape522ii|\
-       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
@@ -308,11 +347,22 @@ ramips_setup_macs()
                [ -n "$lan_mac" ] || lan_mac=$(cat /sys/class/net/eth0/address)
                wan_mac=$(macaddr_add "$lan_mac" 1)
                ;;
+       kng_rc)
+               wan_mac=$(mtd_get_mac_binary factory 28)
+               ;;
        linkits7688 | \
        linkits7688d)
                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)
+               ;;
+       miwifi-mini)
+               wan_mac=$(cat /sys/class/net/eth0/address)
+               lan_mac=$(macaddr_setbit_la "$wan_mac")
+               ;;
        m3|\
        m4|\
        x5|\
@@ -320,6 +370,15 @@ 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)
+               ;;
+       omega2|\
+       omega2p)
+               wan_mac=$(mtd_get_mac_binary factory 4)
+               lan_mac=$(mtd_get_mac_binary factory 46)
+               ;;
        oy-0001)
                lan_mac=$(mtd_get_mac_binary factory 40)
                wan_mac=$(mtd_get_mac_binary factory 46)
@@ -342,6 +401,10 @@ ramips_setup_macs()
                lan_mac=$(mtd_get_mac_ascii u-boot-env LAN_MAC_ADDR)
                wan_mac=$(mtd_get_mac_ascii u-boot-env WAN_MAC_ADDR)
                ;;
+       vr500)
+               lan_mac=$(mtd_get_mac_binary factory 57344)
+               wan_mac=$(mtd_get_mac_binary factory 57350)
+               ;;
        w306r-v20)
                lan_mac=$(cat /sys/class/net/eth0/address)
                wan_mac=$(macaddr_add "$lan_mac" 5)
@@ -360,6 +423,9 @@ ramips_setup_macs()
                lan_mac=$(mtd_get_mac_binary factory 4)
                wan_mac=$(mtd_get_mac_binary factory 40)
                ;;
+       wlr-6000)
+               wan_mac=$(macaddr_add "$(mtd_get_mac_binary factory 32772)" 2)
+               ;;
        wsr-1166)
                local index="$(find_mtd_index "board_data")"
                wan_mac="$(grep -m1 mac= "/dev/mtd${index}" | cut -d= -f2)"
@@ -371,8 +437,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