ath79: put all devices in alphabetical order in scripts

And remove specifying lan interfaces as eth1.1 because this is
handled by ucidef_add_switch.

Signed-off-by: Chuanhong Guo <gch981213@gmail.com>
This commit is contained in:
Chuanhong Guo 2018-08-02 15:14:10 +08:00 committed by Mathias Kresin
parent 3804134369
commit f9065e44a6
3 changed files with 45 additions and 58 deletions

View file

@ -62,8 +62,8 @@ case "$board" in
ucidef_set_led_switch "lan3" "LAN3" "$boardname:green:lan3" "switch0" "0x08" ucidef_set_led_switch "lan3" "LAN3" "$boardname:green:lan3" "switch0" "0x08"
ucidef_set_led_switch "lan4" "LAN4" "$boardname:green:lan4" "switch0" "0x10" ucidef_set_led_switch "lan4" "LAN4" "$boardname:green:lan4" "switch0" "0x10"
;; ;;
"tplink,tl-wr741nd-v4"|\ "tplink,tl-wr740nd-v4"|\
"tplink,tl-wr740nd-v4") "tplink,tl-wr741nd-v4")
ucidef_set_led_netdev "wan" "WAN" "tp-link:green:wan" "eth0" ucidef_set_led_netdev "wan" "WAN" "tp-link:green:wan" "eth0"
ucidef_set_led_switch "lan1" "LAN1" "tp-link:green:lan1" "switch0" "0x04" ucidef_set_led_switch "lan1" "LAN1" "tp-link:green:lan1" "switch0" "0x04"
ucidef_set_led_switch "lan2" "LAN2" "tp-link:green:lan2" "switch0" "0x08" ucidef_set_led_switch "lan2" "LAN2" "tp-link:green:lan2" "switch0" "0x08"

View file

@ -9,9 +9,6 @@ ath79_setup_interfaces()
local board="$1" local board="$1"
case "$board" in case "$board" in
"etactica,eg200")
ucidef_set_interface_lan "eth0" "dhcp"
;;
"avm,fritz300e"|\ "avm,fritz300e"|\
"ocedo,raccoon"|\ "ocedo,raccoon"|\
"pcs,cap324"|\ "pcs,cap324"|\
@ -24,38 +21,49 @@ ath79_setup_interfaces()
"ubnt,unifi") "ubnt,unifi")
ucidef_set_interface_lan "eth0" ucidef_set_interface_lan "eth0"
;; ;;
"buffalo,wzr-hp-g450h")
ucidef_add_switch "switch0" \
"0@eth0" "2:lan" "3:lan" "4:lan" "5:lan" "1:wan"
;;
"embeddedwireless,dorin") "embeddedwireless,dorin")
ucidef_add_switch "switch0" \ ucidef_add_switch "switch0" \
"0@eth0" "1:wan" "2:lan:3" "3:lan:2" "0@eth0" "1:wan" "2:lan:3" "3:lan:2"
;; ;;
"etactica,eg200")
"glinet,ar150") ucidef_set_interface_lan "eth0" "dhcp"
ucidef_set_interfaces_lan_wan "eth1" "eth0"
;; ;;
"glinet,ar150"|\
"glinet,ar300m") "glinet,ar300m")
ucidef_set_interfaces_lan_wan "eth1" "eth0" ucidef_set_interfaces_lan_wan "eth1" "eth0"
;; ;;
"netgear,wndr3800")
ucidef_set_interfaces_lan_wan "eth0" "eth1"
ucidef_add_switch "switch0" \
"0:lan:4" "1:lan:3" "2:lan:2" "3:lan:1" "5u@eth0"
ucidef_add_switch_attr "switch0" "blinkrate" 2
ucidef_add_switch_port_attr "switch0" 1 led 6
ucidef_add_switch_port_attr "switch0" 2 led 9
ucidef_add_switch_port_attr "switch0" 5 led 2
;;
"netgear,wnr612-v2"|\ "netgear,wnr612-v2"|\
"on,n150r") "on,n150r")
ucidef_set_interfaces_lan_wan "eth1.1" "eth0" ucidef_set_interface_wan "eth0"
ucidef_add_switch "switch0" \ ucidef_add_switch "switch0" \
"0@eth1" "1:lan" "2:lan" "3:lan:3" "4:lan:4" "0@eth1" "1:lan" "2:lan" "3:lan:3" "4:lan:4"
;; ;;
"pcs,cr3000") "pcs,cr3000")
ucidef_add_switch "switch0" \ ucidef_add_switch "switch0" \
"0@eth1" "1:lan:1" "2:lan:4" "3:lan:3" "4:lan:2" "0@eth1" "1:lan:1" "2:lan:4" "3:lan:3" "4:lan:2"
ucidef_set_interface_wan "eth0" ucidef_set_interface_wan "eth0"
;; ;;
"pcs,cr5000") "pcs,cr5000")
ucidef_add_switch "switch0" \ ucidef_add_switch "switch0" \
"0@eth0" "1:lan" "2:lan" "3:lan" "4:lan" "5:wan" "0@eth0" "1:lan" "2:lan" "3:lan" "4:lan" "5:wan"
;; ;;
"phicomm,k2t")
ucidef_add_switch "switch0" \
"0@eth0" "3:lan:1" "5:lan:2" "4:wan"
;;
"tplink,tl-archer-c7-v2") "tplink,tl-archer-c7-v2")
ucidef_add_switch "switch0" \ ucidef_add_switch "switch0" \
"0@eth1" "2:lan" "3:lan" "4:lan" "5:lan" "6@eth0" "1:wan" "0@eth1" "2:lan" "3:lan" "4:lan" "5:lan" "6@eth0" "1:wan"
@ -72,16 +80,31 @@ ath79_setup_interfaces()
ucidef_add_switch "switch0" \ ucidef_add_switch "switch0" \
"0@eth0" "2:lan:1" "3:lan:2" "4:lan:3" "5:lan:4" "1:wan" "0@eth0" "2:lan:1" "3:lan:2" "4:lan:3" "5:lan:4" "1:wan"
;; ;;
"tplink,tl-wr1043nd-v1")
ucidef_add_switch "switch0" \
"1:lan" "2:lan" "3:lan" "4:lan" "0:wan" "5@eth0"
;;
"tplink,tl-wr1043nd-v2"|\
"tplink,tl-wr1043nd-v3")
ucidef_add_switch "switch0" \
"0@eth1" "1:lan:4" "2:lan:3" "3:lan:2" "4:lan:1" "5:wan" "6@eth0"
;;
"tplink,tl-wr1043nd-v4")
ucidef_add_switch "switch0" \
"0@eth0" "1:lan:4" "2:lan:3" "3:lan:2" "4:lan:1" "5:wan"
;;
"tplink,tl-wr2543-v1")
ucidef_add_switch "switch0" \
"1:lan" "2:lan" "3:lan" "4:lan" "0:wan" "9@eth0"
;;
"tplink,tl-wr740n-v2") "tplink,tl-wr740n-v2")
ucidef_set_interfaces_lan_wan "eth1.1" "eth0" ucidef_set_interface_wan "eth0"
ucidef_add_switch "switch0" \ ucidef_add_switch "switch0" \
"0@eth1" "1:lan" "2:lan" "3:lan" "4:lan" "0@eth1" "1:lan" "2:lan" "3:lan" "4:lan"
;; ;;
"tplink,tl-wr740nd-v4"|\
"tplink,tl-wr741nd-v4"|\ "tplink,tl-wr741nd-v4")
"tplink,tl-wr740nd-v4") ucidef_set_interface_wan "eth0"
ucidef_set_interfaces_wan "eth0"
ucidef_add_switch "switch0" \ ucidef_add_switch "switch0" \
"0@eth1" "1:lan:4" "2:lan:3" "3:lan:2" "4:lan:1" "0@eth1" "1:lan:4" "2:lan:3" "3:lan:2" "4:lan:1"
;; ;;
@ -90,42 +113,6 @@ ath79_setup_interfaces()
ucidef_add_switch "switch0" \ ucidef_add_switch "switch0" \
"0@eth1" "1:lan:4" "2:lan:3" "3:lan:2" "4:lan:1" "0@eth1" "1:lan:4" "2:lan:3" "3:lan:2" "4:lan:1"
;; ;;
"tplink,tl-wr1043nd-v1")
ucidef_add_switch "switch0" \
"1:lan" "2:lan" "3:lan" "4:lan" "0:wan" "5@eth0"
;;
"tplink,tl-wr1043nd-v4")
ucidef_add_switch "switch0" \
"0@eth0" "1:lan:4" "2:lan:3" "3:lan:2" "4:lan:1" "5:wan"
;;
"tplink,tl-wr1043nd-v2"|\
"tplink,tl-wr1043nd-v3")
ucidef_set_interfaces_lan_wan "eth1.1" "eth0.2"
ucidef_add_switch "switch0" \
"0@eth1" "1:lan:4" "2:lan:3" "3:lan:2" "4:lan:1" "5:wan" "6@eth0"
;;
"tplink,tl-wr2543-v1")
ucidef_add_switch "switch0" \
"1:lan" "2:lan" "3:lan" "4:lan" "0:wan" "9@eth0"
;;
"netgear,wndr3800")
ucidef_set_interfaces_lan_wan "eth0" "eth1"
ucidef_add_switch "switch0" \
"0:lan:4" "1:lan:3" "2:lan:2" "3:lan:1" "5u@eth0"
ucidef_add_switch_attr "switch0" "blinkrate" 2
ucidef_add_switch_port_attr "switch0" 1 led 6
ucidef_add_switch_port_attr "switch0" 2 led 9
ucidef_add_switch_port_attr "switch0" 5 led 2
;;
"buffalo,wzr-hp-g450h")
ucidef_add_switch "switch0" \
"0@eth0" "2:lan" "3:lan" "4:lan" "5:lan" "1:wan"
;;
"phicomm,k2t")
ucidef_add_switch "switch0" \
"0@eth0" "3:lan:1" "5:lan:2" "4:wan"
;;
"ubnt,unifiac-mesh-pro"|\ "ubnt,unifiac-mesh-pro"|\
"ubnt,unifiac-pro") "ubnt,unifiac-pro")
ucidef_add_switch "switch0" \ ucidef_add_switch "switch0" \

View file

@ -60,9 +60,9 @@ case "$FIRMWARE" in
"pcs,cap324"|\ "pcs,cap324"|\
"tplink,tl-mr3220-v1"|\ "tplink,tl-mr3220-v1"|\
"tplink,tl-mr3420-v1"|\ "tplink,tl-mr3420-v1"|\
"tplink,tl-wr2543-v1"|\
"tplink,tl-wr740n-v2"|\ "tplink,tl-wr740n-v2"|\
"tplink,tl-wr841-v7"|\ "tplink,tl-wr841-v7"|\
"tplink,tl-wr2543-v1"|\
"ubnt,unifi") "ubnt,unifi")
ath9k_eeprom_extract "art" 4096 2048 ath9k_eeprom_extract "art" 4096 2048
;; ;;