cleanup ucidef_set_interface* usage

[openwrt/staging/rmilecki.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 c1c5f81ebe5f147add956b9cf9ad5acf14c22644..675dcc98323ea82aa9632ec0fddb624714697013 100755 (executable)
--- a/target/linux/ramips/base-files/etc/board.d/02_network
+++ b/target/linux/ramips/base-files/etc/board.d/02_network
@@ -49,6 +49,7 @@ ramips_setup_interfaces()
        microwrt|\
        mpr-a2|\
        ncs601w|\
+       timecloud|\
        w150m|\
        widora-neo|\
        wnce2001|\
@@ -71,6 +72,7 @@ ramips_setup_interfaces()
        dir-615-h1|\
        firewrt|\
        hlk-rm04|\
+       mac1200rv2|\
        miwifi-mini|\
        miwifi-nano|\
        mt7621|\
@@ -92,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"
                ;;
@@ -114,6 +119,7 @@ ramips_setup_interfaces()
        atp-52b|\
        awm002-evb|\
        awm003-evb|\
+       c20i|\
        c50|\
        dir-645|\
        dir-860l-b1|\
@@ -123,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|\
@@ -172,6 +178,7 @@ ramips_setup_interfaces()
        mzk-ex750np|\
        na930|\
        wli-tx4-ag300n|\
+       wmr-300|\
        wrh-300cr)
                ucidef_set_interface_lan "eth0"
                ;;
@@ -194,9 +201,6 @@ ramips_setup_interfaces()
        wl-330n)
                ucidef_set_interface_lan "eth0.1"
                ;;
-       wmr-300)
-               ucidef_set_interface_lan "eth0"
-               ;;
        mzk-dp150n|\
        vocore)
                ucidef_add_switch "switch0" \
@@ -211,6 +215,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" \
@@ -228,12 +233,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
@@ -310,6 +309,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|\
@@ -330,12 +333,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)
@@ -370,8 +371,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