aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/ar71xx
diff options
context:
space:
mode:
authorJo-Philipp Wich <jow@openwrt.org>2015-12-03 17:30:24 +0000
committerJo-Philipp Wich <jow@openwrt.org>2015-12-03 17:30:24 +0000
commit2bed435f6774c6160f1e8e8bd46a748ca4efc3fb (patch)
tree2646044cba83ea1b38524f6558215cfde5540d5b /target/linux/ar71xx
parent605c909287c19a334fb7fe2dd363392dd8d59e13 (diff)
downloadmaster-187ad058-2bed435f6774c6160f1e8e8bd46a748ca4efc3fb.tar.gz
master-187ad058-2bed435f6774c6160f1e8e8bd46a748ca4efc3fb.tar.bz2
master-187ad058-2bed435f6774c6160f1e8e8bd46a748ca4efc3fb.zip
board.d: merge ucidef_add_switch() and ucidef_add_switch_ports()
This changes uci-defaults-new.sh, config_generate and all relevant board.d files in order combine ucidef_add_switch() and ucidef_add_switch_ports() into a single function. Also removes now superfluous enable and reset arguments. Signed-off-by: Jo-Philipp Wich <jow@openwrt.org> git-svn-id: svn://svn.openwrt.org/openwrt/trunk@47721 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/ar71xx')
-rwxr-xr-xtarget/linux/ar71xx/base-files/etc/board.d/02_network131
1 files changed, 44 insertions, 87 deletions
diff --git a/target/linux/ar71xx/base-files/etc/board.d/02_network b/target/linux/ar71xx/base-files/etc/board.d/02_network
index 707f7d6798..b88b6bb046 100755
--- a/target/linux/ar71xx/base-files/etc/board.d/02_network
+++ b/target/linux/ar71xx/base-files/etc/board.d/02_network
@@ -25,24 +25,21 @@ ubnt-unifi-outdoor)
ap132 |\
wlr8100)
ucidef_set_interfaces_lan_wan "eth0.1" "eth0.2"
- ucidef_add_switch "switch0" "1" "1"
- ucidef_add_switch_ports "switch0" \
+ ucidef_add_switch "switch0" \
"0@eth0" "2:lan" "3:lan" "4:lan" "5:lan" "1:wan"
;;
esr1750 |\
epg5000)
ucidef_set_interfaces_lan_wan "eth0.1" "eth0.2"
- ucidef_add_switch "switch0" "1" "1"
- ucidef_add_switch_ports "switch0" \
+ ucidef_add_switch "switch0" \
"0@eth0" "1:lan:4" "2:lan:3" "3:lan:2" "4:lan:1" "5:wan"
;;
ap136-010 |\
ap147-010)
ucidef_set_interfaces_lan_wan "eth0" "eth1"
- ucidef_add_switch "switch0" "1" "1"
- ucidef_add_switch_ports "switch0" \
+ ucidef_add_switch "switch0" \
"0@eth0" "1:lan" "2:lan" "3:lan" "4:lan" "5:wan" "6@eth1"
;;
@@ -51,8 +48,7 @@ ap135-020 |\
tl-wr1043nd-v2 |\
wzr-450hp2)
ucidef_set_interfaces_lan_wan "eth1" "eth0"
- ucidef_add_switch "switch0" "1" "1"
- ucidef_add_switch_ports "switch0" \
+ ucidef_add_switch "switch0" \
"0@eth1" "1:lan:4" "2:lan:3" "3:lan:2" "4:lan:1" "5:wan" "6@eth0"
;;
@@ -60,30 +56,26 @@ archer-c5 |\
archer-c7 |\
tl-wdr4900-v2)
ucidef_set_interfaces_lan_wan "eth1" "eth0"
- ucidef_add_switch "switch0" "1" "1"
- ucidef_add_switch_ports "switch0" \
+ ucidef_add_switch "switch0" \
"0@eth1" "2:lan" "3:lan" "4:lan" "5:lan" "6@eth0" "1:wan"
;;
bsb)
ucidef_set_interfaces_lan_wan "eth1" "eth0"
- ucidef_add_switch "switch0" "1" "1"
- ucidef_add_switch_ports "switch0" \
+ ucidef_add_switch "switch0" \
"0@eth1" "1:lan" "3:lan" # XXX: confirm cpu port!
ucidef_set_interface_wlan
;;
cpe510)
ucidef_set_interfaces_lan_wan "eth0.1" "eth0.2"
- ucidef_add_switch "switch0" "1" "1"
- ucidef_add_switch_ports "switch0" \
+ ucidef_add_switch "switch0" \
"0@eth0" "5:lan" "4:wan"
;;
airgatewaypro)
ucidef_set_interfaces_lan_wan "eth0.1" "eth0.2"
- ucidef_add_switch "switch0" "1" "1"
- ucidef_add_switch_ports "switch0" \
+ ucidef_add_switch "switch0" \
"0@eth0" "4:lan" "5:wan"
;;
@@ -94,52 +86,46 @@ rb-2011uias |\
rb-2011uas-2hnd|\
rb-2011uias-2hnd)
ucidef_set_interfaces_lan_wan "eth0.1 eth1" "eth0.2"
- ucidef_add_switch "switch0" "1" "1"
case "$board" in
rb-2011uas* | rb-2011uias | rb-2011uias-2hnd)
- ucidef_add_switch_ports "switch0" \
+ ucidef_add_switch "switch0" \
"0@eth0" "2:lan" "3:lan" "4:lan" "5:lan" "1:wan" "6:sfp"
;;
*)
- ucidef_add_switch_ports "switch0" \
+ ucidef_add_switch "switch0" \
"0@eth0" "2:lan" "3:lan" "4:lan" "5:lan" "1:wan"
;;
esac
- ucidef_add_switch "switch1" "1" "1"
- ucidef_add_switch_ports "switch1" \
+ ucidef_add_switch "switch1" \
"0@eth1" "1:lan" "2:lan" "3:lan" "4:lan" "5:lan"
;;
dir-825-b1|\
tew-673gru)
ucidef_set_interfaces_lan_wan "eth0" "eth1"
- ucidef_add_switch "switch0" "1" "1"
- ucidef_add_switch_ports "switch0" \
+ ucidef_add_switch "switch0" \
"0:lan" "1:lan" "2:lan" "3:lan" "5@eth0"
;;
f9k1115v2)
ucidef_set_interfaces_lan_wan "eth1" "eth0"
- ucidef_add_switch "switch0" "1" "1"
- ucidef_add_switch_ports "switch0" \
+ ucidef_add_switch "switch0" \
"2:lan" "3:lan" "4:lan" "5:lan" "6@eth1" \
"0@eth0" "1:wan" # XXX: confirm cpu ports!
;;
nbg460n_550n_550nh)
ucidef_set_interfaces_lan_wan "eth0" "eth1"
- ucidef_add_switch "switch0" "1" "1"
- ucidef_add_switch_ports "switch0" \
+ ucidef_add_switch "switch0" \
"0:lan" "1:lan" "2:lan" "3:lan" "5@eth0"
;;
nbg6616 |\
nbg6716)
ucidef_set_interfaces_lan_wan "eth0" "eth1"
- ucidef_add_switch "switch0" "1" "1"
- ucidef_add_switch_ports "switch0" \
+ ucidef_add_switch "switch0" \
"0@eth0" "1:lan" "2:lan" "3:lan" "4:lan" \
"5:wan" "6@eth1"
;;
@@ -148,30 +134,26 @@ ap143 |\
rb-433 |\
rb-433u)
ucidef_set_interfaces_lan_wan "eth1" "eth0"
- ucidef_add_switch "switch0" "1" "1"
- ucidef_add_switch_ports "switch0" \
+ ucidef_add_switch "switch0" \
"1:lan" "2:lan" "5@eth1"
;;
rb-435g)
ucidef_set_interfaces_lan_wan "eth1" "eth0"
- ucidef_add_switch "switch0" "1" "1"
- ucidef_add_switch_ports "switch0" \
+ ucidef_add_switch "switch0" \
"0@eth1" "1:lan" "2:lan" # XXX: confirm!
;;
rb-450)
ucidef_set_interfaces_lan_wan "eth1" "eth0"
- ucidef_add_switch "switch0" "1" "1"
- ucidef_add_switch_ports "switch0" \
+ ucidef_add_switch "switch0" \
"0:lan" "1:lan" "2:lan" "3:lan" "5@eth1"
;;
rb-450g |\
routerstation-pro)
ucidef_set_interfaces_lan_wan "eth1" "eth0"
- ucidef_add_switch "switch0" "1" "1"
- ucidef_add_switch_ports "switch0" \
+ ucidef_add_switch "switch0" \
"0@eth1" "2:lan:3" "3:lan:2" "4:lan:1"
;;
@@ -181,8 +163,7 @@ rb-751g |\
rb-951g-2hnd |\
wzr-hp-g450h)
ucidef_set_interfaces_lan_wan "eth0.1" "eth0.2"
- ucidef_add_switch "switch0" "1" "1"
- ucidef_add_switch_ports "switch0" \
+ ucidef_add_switch "switch0" \
"0@eth0" "2:lan" "3:lan" "4:lan" "5:lan" "1:wan"
;;
@@ -192,11 +173,9 @@ rb-951ui-2hnd)
rb-493g)
ucidef_set_interfaces_lan_wan "eth0 eth1.1" "eth1.2"
- ucidef_add_switch "switch0" "1" "1"
- ucidef_add_switch_ports "switch0" \
+ ucidef_add_switch "switch0" \
"0@eth0" "1:lan" "2:lan" "3:lan" "4:lan"
- ucidef_add_switch "switch1" "1" "1"
- ucidef_add_switch_ports "switch1" \
+ ucidef_add_switch "switch1" \
"0@eth1" "1:lan" "2:lan" "3:lan" "4:lan" "5:wan"
;;
@@ -204,37 +183,32 @@ wzr-hp-g300nh2 |\
pb92 |\
ap113)
ucidef_set_interfaces_lan_wan "eth0.1" "eth0.2"
- ucidef_add_switch "switch0" "1" "1"
- ucidef_add_switch_ports "switch0" \
+ ucidef_add_switch "switch0" \
"0@eth0" "1:lan:1" "3:lan:2" "4:lan:3" "5:lan:4" "2:wan"
;;
el-m150)
ucidef_set_interfaces_lan_wan "eth1" "eth0"
- ucidef_add_switch "switch0" "1" "1"
- ucidef_add_switch_ports "switch0" \
+ ucidef_add_switch "switch0" \
"0:lan" "1:lan" "3@eth1" # XXX: confirm!
;;
tl-wdr4300|\
tl-wr1041n-v2)
ucidef_set_interfaces_lan_wan "eth0.1" "eth0.2"
- ucidef_add_switch "switch0" "1" "1"
- ucidef_add_switch_ports "switch0" \
+ ucidef_add_switch "switch0" \
"0@eth0" "1:lan:4" "2:lan:3" "3:lan:2" "4:lan:1" "5:wan"
;;
tl-wr1043nd)
ucidef_set_interfaces_lan_wan "eth0.1" "eth0.2"
- ucidef_add_switch "switch0" "1" "1"
- ucidef_add_switch_ports "switch0" \
+ ucidef_add_switch "switch0" \
"1:lan" "2:lan" "3:lan" "4:lan" "0:wan" "5@eth0"
;;
tl-wr2543n)
ucidef_set_interfaces_lan_wan "eth0.1" "eth0.2"
- ucidef_add_switch "switch0" "1" "1"
- ucidef_add_switch_ports "switch0" \
+ ucidef_add_switch "switch0" \
"1:lan" "2:lan" "3:lan" "4:lan" "0:wan" "9@eth0"
;;
@@ -259,36 +233,31 @@ wnr2200 |\
wnr612-v2 |\
wnr1000-v2)
ucidef_set_interfaces_lan_wan "eth1" "eth0"
- ucidef_add_switch "switch0" "1" "1"
- ucidef_add_switch_ports "switch0" \
+ ucidef_add_switch "switch0" \
"0:lan:4" "1:lan:3" "2:lan:2" "3:lan:1" "4@eth1" # XXX: confirm!
;;
uap-pro)
ucidef_set_interfaces_lan_wan "eth0.1" "eth0.2"
- ucidef_add_switch "switch0" "1" "1"
- ucidef_add_switch_ports "switch0" \
+ ucidef_add_switch "switch0" \
"0@eth0" "1:lan" "2:wan"
;;
nanostation-m-xw)
ucidef_set_interfaces_lan_wan "eth0.1" "eth0.2"
- ucidef_add_switch "switch0" "1" "1"
- ucidef_add_switch_ports "switch0" \
+ ucidef_add_switch "switch0" \
"0@eth0" "5:lan" "1:wan"
;;
wrt160nl)
ucidef_set_interfaces_lan_wan "eth0" "eth1"
- ucidef_add_switch "switch0" "1" "1"
- ucidef_add_switch_ports "switch0" \
+ ucidef_add_switch "switch0" \
"0:lan:4" "1:lan:3" "2:lan:2" "3:lan:1" "4@eth0"
;;
wzr-hp-g300nh)
ucidef_set_interfaces_lan_wan "eth0.1" "eth1"
- ucidef_add_switch "switch0" "1" "1"
- ucidef_add_switch_ports "switch0" \
+ ucidef_add_switch "switch0" \
"0:lan" "1:lan" "2:lan" "3:lan" "5@eth0"
;;
@@ -296,8 +265,7 @@ dgl-5500-a1 |\
dir-825-c1)
local mac
ucidef_set_interfaces_lan_wan "eth0.1" "eth0.2"
- ucidef_add_switch "switch0" "1" "1"
- ucidef_add_switch_ports "switch0" \
+ ucidef_add_switch "switch0" \
"0@eth0" "1:lan" "2:lan" "3:lan" "4:lan" "5:wan"
mac=$(mtd_get_mac_ascii nvram "wan_mac")
[ -n "$mac" ] && ucidef_set_interface_macaddr "wan" "$mac"
@@ -306,8 +274,7 @@ dir-825-c1)
mynet-n750)
local mac
ucidef_set_interfaces_lan_wan "eth0.1" "eth0.2"
- ucidef_add_switch "switch0" "1" "1"
- ucidef_add_switch_ports "switch0" \
+ ucidef_add_switch "switch0" \
"0@eth0" "1:lan" "2:lan" "3:lan" "4:lan" "5:wan"
mac=$(mtd_get_mac_ascii devdata "wanmac")
[ -n "$mac" ] && ucidef_set_interface_macaddr "wan" "$mac"
@@ -322,8 +289,7 @@ dir-835-a1 |\
wndr3700v4 | \
wndr4300)
ucidef_set_interfaces_lan_wan "eth0.1" "eth0.2"
- ucidef_add_switch "switch0" "1" "1"
- ucidef_add_switch_ports "switch0" \
+ ucidef_add_switch "switch0" \
"0@eth0" "1:lan" "2:lan" "3:lan" "4:lan" "5:wan"
mac_lan=$(mtd_get_mac_binary caldata 0)
[ -n "$mac_lan" ] && ucidef_set_interface_macaddr "lan" "$mac_lan"
@@ -334,8 +300,7 @@ wndr4300)
esr900)
local mac
ucidef_set_interfaces_lan_wan "eth0.1" "eth0.2"
- ucidef_add_switch "switch0" "1" "1"
- ucidef_add_switch_ports "switch0" \
+ ucidef_add_switch "switch0" \
"0@eth0" "1:lan" "2:lan" "3:lan" "4:lan" "5:wan"
mac=$(mtd_get_mac_ascii u-boot-env "wanaddr")
[ -n "$mac" ] && ucidef_set_interface_macaddr "wan" "$mac"
@@ -425,15 +390,13 @@ wpe72)
gl-ar300)
ucidef_set_interfaces_lan_wan "eth1" "eth0"
- ucidef_add_switch "switch0" "1" "1"
- ucidef_add_switch_ports "switch0" \
+ ucidef_add_switch "switch0" \
"0@eth1" "1:lan" "2:lan" "3:lan" "4:lan"
;;
wpj344)
ucidef_set_interfaces_lan_wan "eth0.1" "eth0.2"
- ucidef_add_switch "switch0" "1" "1"
- ucidef_add_switch_ports "switch0" \
+ ucidef_add_switch "switch0" \
"0@eth0" "3:lan" "2:wan"
;;
@@ -443,8 +406,7 @@ wpj531)
wpj558)
ucidef_set_interfaces_lan_wan "eth0.1" "eth0.2"
- ucidef_add_switch "switch0" "1" "1"
- ucidef_add_switch_ports "switch0" \
+ ucidef_add_switch "switch0" \
"5:lan" "1:wan" "6@eth0"
;;
@@ -482,35 +444,30 @@ whr-hp-g300n |\
whr-hp-gn |\
wzr-hp-ag300h)
ucidef_set_interfaces_lan_wan "eth0" "eth1"
- ucidef_add_switch "switch0" "1" "1"
- ucidef_add_switch_ports "switch0" \
+ ucidef_add_switch "switch0" \
"0@eth0" "1:lan:4" "2:lan:3" "3:lan:2" "4:lan:1"
;;
wzr-hp-g450h)
ucidef_set_interfaces_lan_wan "eth0.1" "eth0.2"
- ucidef_add_switch "switch0" "1" "1"
- ucidef_add_switch_ports "switch0" \
+ ucidef_add_switch "switch0" \
"0@eth0" "2:lan:1 3:lan:2 4:lan:3 5:lan:4" "1:wan"
;;
ew-dorin)
ucidef_set_interfaces_lan_wan "eth0.1" "eth0.2"
- ucidef_add_switch "switch0" "1" "1"
- ucidef_add_switch_ports "switch0" \
+ ucidef_add_switch "switch0" \
"0@eth0" "1:lan" "2:lan" "3:wan"
;;
ew-dorin-router)
ucidef_set_interfaces_lan_wan "eth0" "eth1"
- ucidef_add_switch "switch0" "1" "1"
- ucidef_add_switch_ports "switch0" "0@eth0" "2:lan" "3:lan"
+ ucidef_add_switch "switch0" "0@eth0" "2:lan" "3:lan"
;;
wndr3700)
ucidef_set_interfaces_lan_wan "eth0" "eth1"
- ucidef_add_switch "switch0" "1" "1"
- ucidef_add_switch_ports "switch0" \
+ ucidef_add_switch "switch0" \
"0:lan" "1:lan" "2:lan" "3:lan" "5@eth0"
# Blinkrate: 0=43ms; 1=84ms; 2=120ms; 3=170ms; 4=340ms; 5=670ms