lantiq: fix ARV7519RW22 switch port indexing

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

diff --git a/target/linux/lantiq/base-files/etc/board.d/02_network b/target/linux/lantiq/base-files/etc/board.d/02_network
index 3f61326259cf0bc346348c62b027b9339c2aa619..6ab5cb979e847e896675144468279e55475f86fc 100755 (executable)
--- a/target/linux/lantiq/base-files/etc/board.d/02_network
+++ b/target/linux/lantiq/base-files/etc/board.d/02_network
@@ -21,6 +21,11 @@ interface_wan=""
 board=$(lantiq_board_name)
 
 case "$board" in
+ACMP252|GIGASX76X)
+       ucidef_add_switch "switch0" \
+               "1:lan:4" "2:lan:3" "3:lan:2" "4:lan:1" "5t@eth0"
+       ;;
+
 ARV4510PW)
        lan_mac=$(mtd_get_mac_ascii uboot_env ethaddr)
        wan_mac=$(macaddr_add "$lan_mac" 1)
@@ -28,19 +33,14 @@ ARV4510PW)
                "0:lan:4" "2:lan:2" "1:lan:3" "3:lan:1" "5t@eth0"
        ;;
 
-ARV4520PW)
-       ucidef_add_switch "switch0" \
-               "0:lan:4" "1:lan:3" "2:lan:2" "3:lan:1" "5t@eth0"
-       ;;
-
-ACMP252|GIGASX76X)
+ARV4519PW|ARV7510PW22|ARV7518PW|ARV752DPW22|ARV8539PW22)
        ucidef_add_switch "switch0" \
-               "1:lan:4" "2:lan:3" "3:lan:2" "4:lan:1" "5t@eth0"
+               "0t@eth0" "2:lan" "3:lan" "4:lan" "5:lan"
        ;;
 
-ARV4519PW|ARV7510PW22|ARV7518PW|ARV752DPW22|ARV8539PW22)
+ARV4520PW)
        ucidef_add_switch "switch0" \
-               "0t@eth0" "2:lan" "3:lan" "4:lan" "5:lan"
+               "0:lan:4" "1:lan:3" "2:lan:2" "3:lan:1" "5t@eth0"
        ;;
 
 ARV7506PW11)
@@ -55,9 +55,30 @@ ARV7519PW)
                "0:lan" "1:lan" "2:lan" "3:lan" "4t@eth0"
        ;;
 
-WBMR)
+ARV7519RW22)
+       wan_mac=$(macaddr_add "$(mtd_get_mac_binary boardconfig 22)" 1)
        ucidef_add_switch "switch0" \
-               "0t@eth0" "2:lan" "3:lan" "4:lan" "5:lan"
+               "0:lan:5" "2:lan:3" "3:lan:4" "4:lan:1" "5:lan:2" "6t@eth0"
+       ;;
+
+BTHOMEHUBV2B)
+       lan_mac=$(mtd_get_mac_ascii uboot_env ethaddr)
+       wan_mac=$(macaddr_add "$lan_mac" 1)
+       ucidef_add_switch "switch0" \
+               "1:lan" "2:lan" "3:lan" "4:lan" "5t@eth0"
+       ;;
+
+BTHOMEHUBV3A)
+       lan_mac=$(mtd_get_mac_ascii uboot_env ethaddr)
+       wan_mac=$(macaddr_add "$lan_mac" 1)
+       ucidef_set_interface_lan 'eth0'
+       ;;
+
+BTHOMEHUBV5A)
+       lan_mac=$(mtd_get_mac_binary_ubi caldata 4364)
+       wan_mac=$(macaddr_add "$lan_mac" 1)
+       ucidef_add_switch "switch0" \
+               "0:lan:3" "1:lan:4" "2:lan:2" "4:lan:1" "6t@eth0"
        ;;
 
 DGN3500*)
@@ -65,6 +86,13 @@ DGN3500*)
                "0:lan:4" "1:lan:3" "2:lan:2" "3:lan:1" "5t@eth0"
        ;;
 
+EASY80920NAND|EASY80920NOR)
+       lan_mac=$(mtd_get_mac_ascii uboot_env ethaddr)
+       wan_mac=$(macaddr_add "$lan_mac" 1)
+       ucidef_add_switch "switch0" \
+               "0:lan:4" "1:lan:3" "2:lan:2" "4:lan:1" "5:wan:5" "6t@eth0"
+       ;;
+
 FRITZ7360SL)
        ucidef_add_switch "switch0" \
                "0:lan:3" "1:lan:4" "2:lan:2" "4:lan:1" "6t@eth0"
@@ -93,61 +121,41 @@ TDW8970|TDW8980)
                "0:lan:2" "2:lan:3" "4:lan:4" "5:lan:1" "6t@eth0"
        ;;
 
-VR200v)
-       wan_mac=$(macaddr_add "$(mtd_get_mac_binary romfile 61696)" 1)
-       ucidef_add_switch "switch0" \
-               "0:lan" "2:lan" "4:lan" "5:lan" "6t@eth0"
-       ;;
-
-ARV7519RW22)
-       wan_mac=$(macaddr_add "$(mtd_get_mac_binary boardconfig 22)" 1)
-       ucidef_add_switch "switch0" \
-               "0:lan" "2:lan" "3:lan" "4:lan" "5:lan" "6t@eth0"
-       ;;
-
-BTHOMEHUBV2B)
-       lan_mac=$(mtd_get_mac_ascii uboot_env ethaddr)
+VG3503J)
+       lan_mac=$(mtd_get_mac_ascii uboot-env ethaddr)
        wan_mac=$(macaddr_add "$lan_mac" 1)
        ucidef_add_switch "switch0" \
-               "1:lan" "2:lan" "3:lan" "4:lan" "5t@eth0"
+               "2:lan:1" "4:lan:2" "6t@eth0"
        ;;
 
-BTHOMEHUBV3A)
-       lan_mac=$(mtd_get_mac_ascii uboot_env ethaddr)
-       wan_mac=$(macaddr_add "$lan_mac" 1)
-       ucidef_set_interface_lan 'eth0'
+VR200v)
+       wan_mac=$(macaddr_add "$(mtd_get_mac_binary romfile 61696)" 1)
+       ucidef_add_switch "switch0" \
+               "0:lan" "2:lan" "4:lan" "5:lan" "6t@eth0"
        ;;
 
-BTHOMEHUBV5A)
-       wan_mac=$(macaddr_add "$(mtd_get_mac_binary caldata 4364)" 1)
+VGV7510KW22*)
+       wan_mac=$(macaddr_add "$(mtd_get_mac_binary board_config 22)" 2)
        ucidef_add_switch "switch0" \
-               "0:lan:3" "1:lan:4" "2:lan:2" "4:lan:1" "6t@eth0"
+               "2:lan:2" "3:lan:1" "4:lan:4" "5:lan:3" "6t@eth0"
        ;;
 
-VGV7519)
-       wan_mac=$(macaddr_add "$(mtd_get_mac_binary board_config 22)" 1)
+VGV7519*)
+       wan_mac=$(mtd_get_mac_binary board_config 22)
        ucidef_add_switch "switch0" \
                "0:lan:4" "1:lan:3" "2:lan:2" "4:lan:1" "6t@eth0"
        ;;
 
-VGV7510KW22)
-       wan_mac=$(macaddr_add "$(mtd_get_mac_binary board_config 22)" 1)
+WBMR)
        ucidef_add_switch "switch0" \
-               "2:lan:2" "3:lan:1" "4:lan:4" "5:lan:3" "6t@eth0"
+               "0t@eth0" "2:lan" "3:lan" "4:lan" "5:lan"
        ;;
 
 WBMR300)
        lan_mac=$(mtd_get_mac_ascii ubootconfig ethaddr)
        wan_mac="$lan_mac"
        ucidef_add_switch "switch0" \
-               "2:lan:2" "3:lan:3" "5:lan:4" "4:wan:1" "6t@eth0"
-       ;;
-
-EASY80920NAND|EASY80920NOR)
-       lan_mac=$(mtd_get_mac_ascii uboot_env ethaddr)
-       wan_mac=$(macaddr_add "$lan_mac" 1)
-       ucidef_add_switch "switch0" \
-               "0:lan:4" "1:lan:3" "2:lan:2" "4:lan:1" "5:wan:5" "6t@eth0"
+               "5:lan:2" "2:lan:3" "3:lan:4" "4:wan:1" "6t@eth0"
        ;;
 
 *)
@@ -170,9 +178,10 @@ fi
 
 ucidef_set_interface_wan "$interface_wan" "pppoe"
 
-[ -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_flush
 
 exit 0
+