aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux
diff options
context:
space:
mode:
authorChuanhong Guo <gch981213@gmail.com>2018-08-02 15:14:10 +0800
committerMathias Kresin <dev@kresin.me>2018-08-06 07:31:54 +0200
commitf9065e44a6396dabfe578b87d7dad518253c6242 (patch)
tree60e954e479f3100010875f6966d3aae96b16ab8f /target/linux
parent3804134369aad07ee92d11dc3531bd52cbba19cc (diff)
downloadupstream-f9065e44a6396dabfe578b87d7dad518253c6242.tar.gz
upstream-f9065e44a6396dabfe578b87d7dad518253c6242.tar.bz2
upstream-f9065e44a6396dabfe578b87d7dad518253c6242.zip
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>
Diffstat (limited to 'target/linux')
-rwxr-xr-xtarget/linux/ath79/base-files/etc/board.d/01_leds4
-rwxr-xr-xtarget/linux/ath79/base-files/etc/board.d/02_network83
-rw-r--r--target/linux/ath79/base-files/etc/hotplug.d/firmware/10-ath9k-eeprom2
3 files changed, 38 insertions, 51 deletions
diff --git a/target/linux/ath79/base-files/etc/board.d/01_leds b/target/linux/ath79/base-files/etc/board.d/01_leds
index 4443a5545a..f13a187350 100755
--- a/target/linux/ath79/base-files/etc/board.d/01_leds
+++ b/target/linux/ath79/base-files/etc/board.d/01_leds
@@ -62,8 +62,8 @@ case "$board" in
ucidef_set_led_switch "lan3" "LAN3" "$boardname:green:lan3" "switch0" "0x08"
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_switch "lan1" "LAN1" "tp-link:green:lan1" "switch0" "0x04"
ucidef_set_led_switch "lan2" "LAN2" "tp-link:green:lan2" "switch0" "0x08"
diff --git a/target/linux/ath79/base-files/etc/board.d/02_network b/target/linux/ath79/base-files/etc/board.d/02_network
index 2cffbee39e..dc320f08c4 100755
--- a/target/linux/ath79/base-files/etc/board.d/02_network
+++ b/target/linux/ath79/base-files/etc/board.d/02_network
@@ -9,9 +9,6 @@ ath79_setup_interfaces()
local board="$1"
case "$board" in
- "etactica,eg200")
- ucidef_set_interface_lan "eth0" "dhcp"
- ;;
"avm,fritz300e"|\
"ocedo,raccoon"|\
"pcs,cap324"|\
@@ -24,38 +21,49 @@ ath79_setup_interfaces()
"ubnt,unifi")
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")
ucidef_add_switch "switch0" \
"0@eth0" "1:wan" "2:lan:3" "3:lan:2"
;;
-
- "glinet,ar150")
- ucidef_set_interfaces_lan_wan "eth1" "eth0"
+ "etactica,eg200")
+ ucidef_set_interface_lan "eth0" "dhcp"
;;
-
+ "glinet,ar150"|\
"glinet,ar300m")
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"|\
"on,n150r")
- ucidef_set_interfaces_lan_wan "eth1.1" "eth0"
+ ucidef_set_interface_wan "eth0"
ucidef_add_switch "switch0" \
"0@eth1" "1:lan" "2:lan" "3:lan:3" "4:lan:4"
;;
-
"pcs,cr3000")
ucidef_add_switch "switch0" \
"0@eth1" "1:lan:1" "2:lan:4" "3:lan:3" "4:lan:2"
ucidef_set_interface_wan "eth0"
;;
-
"pcs,cr5000")
ucidef_add_switch "switch0" \
"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")
ucidef_add_switch "switch0" \
"0@eth1" "2:lan" "3:lan" "4:lan" "5:lan" "6@eth0" "1:wan"
@@ -72,59 +80,38 @@ ath79_setup_interfaces()
ucidef_add_switch "switch0" \
"0@eth0" "2:lan:1" "3:lan:2" "4:lan:3" "5:lan:4" "1:wan"
;;
-
- "tplink,tl-wr740n-v2")
- ucidef_set_interfaces_lan_wan "eth1.1" "eth0"
- ucidef_add_switch "switch0" \
- "0@eth1" "1:lan" "2:lan" "3:lan" "4:lan"
- ;;
-
- "tplink,tl-wr741nd-v4"|\
- "tplink,tl-wr740nd-v4")
- ucidef_set_interfaces_wan "eth0"
- ucidef_add_switch "switch0" \
- "0@eth1" "1:lan:4" "2:lan:3" "3:lan:2" "4:lan:1"
- ;;
- "tplink,tl-wr841n-v9")
- ucidef_set_interface_wan "eth0"
- ucidef_add_switch "switch0" \
- "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-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"
;;
- "netgear,wndr3800")
- ucidef_set_interfaces_lan_wan "eth0" "eth1"
+ "tplink,tl-wr740n-v2")
+ ucidef_set_interface_wan "eth0"
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
+ "0@eth1" "1:lan" "2:lan" "3:lan" "4:lan"
;;
- "buffalo,wzr-hp-g450h")
+ "tplink,tl-wr740nd-v4"|\
+ "tplink,tl-wr741nd-v4")
+ ucidef_set_interface_wan "eth0"
ucidef_add_switch "switch0" \
- "0@eth0" "2:lan" "3:lan" "4:lan" "5:lan" "1:wan"
+ "0@eth1" "1:lan:4" "2:lan:3" "3:lan:2" "4:lan:1"
;;
- "phicomm,k2t")
+ "tplink,tl-wr841n-v9")
+ ucidef_set_interface_wan "eth0"
ucidef_add_switch "switch0" \
- "0@eth0" "3:lan:1" "5:lan:2" "4:wan"
+ "0@eth1" "1:lan:4" "2:lan:3" "3:lan:2" "4:lan:1"
;;
"ubnt,unifiac-mesh-pro"|\
"ubnt,unifiac-pro")
diff --git a/target/linux/ath79/base-files/etc/hotplug.d/firmware/10-ath9k-eeprom b/target/linux/ath79/base-files/etc/hotplug.d/firmware/10-ath9k-eeprom
index a687239d44..2dac7768c1 100644
--- a/target/linux/ath79/base-files/etc/hotplug.d/firmware/10-ath9k-eeprom
+++ b/target/linux/ath79/base-files/etc/hotplug.d/firmware/10-ath9k-eeprom
@@ -60,9 +60,9 @@ case "$FIRMWARE" in
"pcs,cap324"|\
"tplink,tl-mr3220-v1"|\
"tplink,tl-mr3420-v1"|\
+ "tplink,tl-wr2543-v1"|\
"tplink,tl-wr740n-v2"|\
"tplink,tl-wr841-v7"|\
- "tplink,tl-wr2543-v1"|\
"ubnt,unifi")
ath9k_eeprom_extract "art" 4096 2048
;;