ar71xx: base-files: rework etc/board.d/02_network

Convert etc/board.d/02_network in ar71xx target to the same shape
as we have in ramips target. Split code into two new functions:

- interface/s setup in ar71xx_setup_interfaces()
- MAC/s setup in ar71xx_setup_macs()

Signed-off-by: Piotr Dymacz <pepe2k@gmail.com>
This commit is contained in:
Piotr Dymacz 2016-09-27 23:41:12 +02:00 committed by John Crispin
parent 4ef1144958
commit 4fa90c49c1

View file

@ -7,87 +7,86 @@
. /lib/functions/uci-defaults.sh
. /lib/ar71xx.sh
board_config_update
ar71xx_setup_interfaces()
{
local board="$1"
board=$(ar71xx_board_name)
case "$board" in
all0315n |\
all0258n |\
dr344 |\
ja76pf2|\
rocket-m-ti |\
ubnt-unifi-outdoor)
case "$board" in
all0315n |\
all0258n |\
dr344 |\
ja76pf2|\
rocket-m-ti |\
ubnt-unifi-outdoor)
ucidef_set_interface_lan "eth0 eth1"
;;
ap132 |\
ap152 |\
wlr8100)
ap132 |\
ap152 |\
wlr8100)
ucidef_add_switch "switch0" \
"0@eth0" "2:lan" "3:lan" "4:lan" "5:lan" "1:wan"
;;
esr1750 |\
epg5000)
esr1750 |\
epg5000)
ucidef_add_switch "switch0" \
"0@eth0" "1:lan:4" "2:lan:3" "3:lan:2" "4:lan:1" "5:wan"
;;
cr5000)
cr5000)
ucidef_add_switch "switch0" \
"0@eth0" "1:lan" "2:lan" "3:lan" "4:lan" "5:wan"
;;
ap136-010 |\
ap147-010)
ap136-010 |\
ap147-010)
ucidef_set_interfaces_lan_wan "eth0" "eth1"
ucidef_add_switch "switch0" \
"0@eth0" "1:lan" "2:lan" "3:lan" "4:lan" "5:wan" "6@eth1"
;;
ap136-020 |\
ap135-020 |\
tew-823dru |\
tl-wr1043nd-v2 |\
wzr-450hp2)
ap136-020 |\
ap135-020 |\
tew-823dru |\
tl-wr1043nd-v2 |\
wzr-450hp2)
ucidef_set_interfaces_lan_wan "eth1" "eth0"
ucidef_add_switch "switch0" \
"0@eth1" "1:lan:4" "2:lan:3" "3:lan:2" "4:lan:1" "5:wan" "6@eth0"
;;
archer-c5 |\
archer-c7 |\
tl-wdr4900-v2)
archer-c5 |\
archer-c7 |\
tl-wdr4900-v2)
ucidef_set_interfaces_lan_wan "eth1" "eth0"
ucidef_add_switch "switch0" \
"0@eth1" "2:lan" "3:lan" "4:lan" "5:lan" "6@eth0" "1:wan"
;;
bsb)
bsb)
ucidef_set_interfaces_lan_wan "eth1" "eth0"
ucidef_add_switch "switch0" \
"0@eth1" "1:lan" "3:lan" # XXX: confirm cpu port!
;;
cpe210|\
cpe510)
cpe210|\
cpe510)
ucidef_add_switch "switch0" \
"0@eth0" "5:lan" "4:wan"
;;
airgatewaypro)
airgatewaypro)
ucidef_add_switch "switch0" \
"0@eth0" "4:lan" "5:wan"
;;
db120 |\
rb-2011l | \
rb-2011uas |\
rb-2011uias |\
rb-2011uas-2hnd|\
rb-2011uias-2hnd)
db120 |\
rb-2011l | \
rb-2011uas |\
rb-2011uias |\
rb-2011uas-2hnd|\
rb-2011uias-2hnd)
case "$board" in
rb-2011uas* | rb-2011uias | rb-2011uias-2hnd)
ucidef_add_switch "switch0" \
@ -103,75 +102,75 @@ rb-2011uias-2hnd)
"0@eth1" "1:lan" "2:lan" "3:lan" "4:lan" "5:lan"
;;
dir-825-b1|\
tew-673gru)
dir-825-b1|\
tew-673gru)
ucidef_set_interfaces_lan_wan "eth0" "eth1"
ucidef_add_switch "switch0" \
"0:lan" "1:lan" "2:lan" "3:lan" "5@eth0"
;;
f9k1115v2)
f9k1115v2)
ucidef_set_interfaces_lan_wan "eth1" "eth0"
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)
nbg460n_550n_550nh)
ucidef_set_interfaces_lan_wan "eth0" "eth1"
ucidef_add_switch "switch0" \
"0:lan" "1:lan" "2:lan" "3:lan" "5@eth0"
;;
nbg6616 |\
nbg6716)
nbg6616 |\
nbg6716)
ucidef_set_interfaces_lan_wan "eth0" "eth1"
ucidef_add_switch "switch0" \
"0@eth0" "1:lan" "2:lan" "3:lan" "4:lan" \
"5:wan" "6@eth1"
;;
ap143 |\
rb-433 |\
rb-433u)
ap143 |\
rb-433 |\
rb-433u)
ucidef_set_interfaces_lan_wan "eth1" "eth0"
ucidef_add_switch "switch0" \
"1:lan" "2:lan" "5@eth1"
;;
rb-435g)
rb-435g)
ucidef_set_interfaces_lan_wan "eth1" "eth0"
ucidef_add_switch "switch0" \
"0@eth1" "1:lan" "2:lan" # XXX: confirm!
;;
rb-450)
rb-450)
ucidef_set_interfaces_lan_wan "eth1" "eth0"
ucidef_add_switch "switch0" \
"0:lan" "1:lan" "2:lan" "3:lan" "5@eth1"
;;
rb-450g |\
routerstation-pro)
rb-450g |\
routerstation-pro)
ucidef_set_interfaces_lan_wan "eth1" "eth0"
ucidef_add_switch "switch0" \
"0@eth1" "2:lan:3" "3:lan:2" "4:lan:1"
;;
ap136 |\
rb-750gl |\
rb-751g |\
rb-951g-2hnd |\
wzr-hp-g450h)
ap136 |\
rb-750gl |\
rb-751g |\
rb-951g-2hnd |\
wzr-hp-g450h)
ucidef_add_switch "switch0" \
"0@eth0" "2:lan" "3:lan" "4:lan" "5:lan" "1:wan"
;;
rb-951ui-2hnd)
rb-951ui-2hnd)
ucidef_set_interfaces_lan_wan "eth1" "eth0"
;;
rb-493g)
rb-493g)
ucidef_set_interfaces_lan_wan "eth0 eth1.1" "eth1.2"
ucidef_add_switch "switch0" \
"0@eth0" "1:lan" "2:lan" "3:lan" "4:lan"
@ -179,328 +178,315 @@ rb-493g)
"0@eth1" "1:lan" "2:lan" "3:lan" "4:lan" "5:wan"
;;
wzr-hp-g300nh2 |\
pb92 |\
ap113)
wzr-hp-g300nh2 |\
pb92 |\
ap113)
ucidef_add_switch "switch0" \
"0@eth0" "1:lan:1" "3:lan:2" "4:lan:3" "5:lan:4" "2:wan"
;;
el-m150)
el-m150)
ucidef_set_interfaces_lan_wan "eth1" "eth0"
ucidef_add_switch "switch0" \
"0:lan" "1:lan" "3@eth1" # XXX: confirm!
;;
tellstick-znet-lite)
tellstick-znet-lite)
ucidef_set_interface_wan "eth0"
ucidef_set_interface_raw "wlan" "wlan0" "dhcp"
;;
tl-wdr4300|\
tl-wr1041n-v2)
tl-wdr4300|\
tl-wr1041n-v2)
ucidef_add_switch "switch0" \
"0@eth0" "2:lan:1" "3:lan:2" "4:lan:3" "5:lan:4" "1:wan"
;;
tl-wr1043nd)
tl-wr1043nd)
ucidef_add_switch "switch0" \
"1:lan" "2:lan" "3:lan" "4:lan" "0:wan" "5@eth0"
;;
tl-wr2543n)
tl-wr2543n)
ucidef_add_switch "switch0" \
"1:lan" "2:lan" "3:lan" "4:lan" "0:wan" "9@eth0"
;;
tl-wr841n-v1|\
tl-wr941nd)
tl-wr841n-v1|\
tl-wr941nd)
ucidef_set_interface_raw "eth" "eth0"
ucidef_set_interfaces_lan_wan "lan1 lan2 lan3 lan4" "wan"
;;
dir-615-i1 |\
omy-g1 |\
r6100 |\
smart-300 |\
tl-mr3420-v2 |\
tl-wr841n-v8 |\
tl-wr842n-v2 |\
tl-wr941nd-v5 |\
tl-wr941nd-v6 |\
tl-wdr6500-v2 |\
wnr2000-v3 |\
wnr2000-v4 |\
wnr2200 |\
wnr612-v2 |\
wnr1000-v2 |\
wpn824n)
dir-615-i1 |\
omy-g1 |\
r6100 |\
smart-300 |\
tl-mr3420-v2 |\
tl-wr841n-v8 |\
tl-wr842n-v2 |\
tl-wr941nd-v5 |\
tl-wr941nd-v6 |\
tl-wdr6500-v2 |\
wnr2000-v3 |\
wnr2000-v4 |\
wnr2200 |\
wnr612-v2 |\
wnr1000-v2 |\
wpn824n)
ucidef_set_interfaces_lan_wan "eth1" "eth0"
ucidef_add_switch "switch0" \
"0:lan:4" "1:lan:3" "2:lan:2" "3:lan:1" "4@eth1" # XXX: confirm!
;;
uap-pro)
uap-pro)
ucidef_add_switch "switch0" \
"0@eth0" "1:lan" "2:wan"
;;
nanostation-m-xw)
nanostation-m-xw)
ucidef_add_switch "switch0" \
"0@eth0" "5:lan" "1:wan"
;;
wrt160nl)
wrt160nl)
ucidef_set_interfaces_lan_wan "eth0" "eth1"
ucidef_add_switch "switch0" \
"0:lan:4" "1:lan:3" "2:lan:2" "3:lan:1" "4@eth0"
;;
wzr-hp-g300nh)
wzr-hp-g300nh)
ucidef_set_interfaces_lan_wan "eth0" "eth1"
ucidef_add_switch "switch0" \
"0:lan" "1:lan" "2:lan" "3:lan" "5@eth0"
;;
cr3000)
cr3000)
ucidef_set_interfaces_lan_wan "eth0" "eth1"
ucidef_add_switch "switch0" \
"0@eth0" "1:lan:1" "2:lan:4" "3:lan:3" "4:lan:2"
;;
dgl-5500-a1 |\
dir-825-c1)
local mac
dgl-5500-a1 |\
dir-825-c1)
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"
;;
mynet-n750)
local mac
mynet-n750)
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"
;;
onion-omega)
onion-omega)
ucidef_set_interface_lan "wlan0"
;;
dhp-1565-a1 |\
dir-835-a1 |\
wndr3700v4 | \
wndr4300)
dhp-1565-a1 |\
dir-835-a1 |\
wndr3700v4 | \
wndr4300)
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"
mac_wan=$(mtd_get_mac_binary caldata 6)
[ -n "$mac_wan" ] && ucidef_set_interface_macaddr "wan" "$mac_wan"
;;
esr900)
local mac
esr900)
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"
;;
dlan-hotspot |\
dlan-pro-500-wp)
dlan-hotspot |\
dlan-pro-500-wp)
ucidef_set_interface_lan "eth0 eth1"
;;
dlan-pro-1200-ac)
dlan-pro-1200-ac)
ucidef_set_interface_lan "eth0"
ucidef_add_switch "switch0" \
"0@eth0" "2:lan" "3:lan" "4:lan"
ucidef_add_switch_attr "switch0" "enable" "false"
;;
alfa-ap120c |\
all0305 |\
antminer-s1 |\
antminer-s3 |\
antrouter-r1 |\
aw-nr580 |\
bullet-m |\
c-55 |\
cap4200ag |\
eap300v2 |\
eap7660d |\
el-mini |\
loco-m-xw |\
mr1750 |\
mr1750v2 |\
mr18 |\
mr600 |\
mr600v2 |\
mr900 |\
mr900v2 |\
rb-411 |\
rb-911g-2hpnd |\
rb-911g-5hpacd |\
rb-911g-5hpnd |\
rb-912uag-2hpnd |\
rb-912uag-5hpnd |\
rb-sxt2n |\
rb-sxt5n |\
rocket-m-xw |\
tl-mr10u |\
tl-mr11u |\
tl-mr12u |\
tl-mr13u |\
tl-mr3020 |\
tl-mr3040 |\
tl-mr3040-v2 |\
tl-wa701nd-v2 |\
tl-wa7210n-v2 |\
tl-wa750re |\
tl-wa850re |\
tl-wa830re-v2 |\
tl-wa801nd-v2 |\
tl-wa901nd |\
tl-wa901nd-v2 |\
tl-wa901nd-v3 |\
tl-wa901nd-v4 |\
tl-wr703n |\
tube2h |\
unifiac-lite |\
wndap360 |\
mynet-rext |\
wp543)
alfa-ap120c |\
all0305 |\
antminer-s1 |\
antminer-s3 |\
antrouter-r1 |\
aw-nr580 |\
bullet-m |\
c-55 |\
cap4200ag |\
eap300v2 |\
eap7660d |\
el-mini |\
loco-m-xw |\
mr1750 |\
mr1750v2 |\
mr18 |\
mr600 |\
mr600v2 |\
mr900 |\
mr900v2 |\
rb-411 |\
rb-911g-2hpnd |\
rb-911g-5hpacd |\
rb-911g-5hpnd |\
rb-912uag-2hpnd |\
rb-912uag-5hpnd |\
rb-sxt2n |\
rb-sxt5n |\
rocket-m-xw |\
tl-mr10u |\
tl-mr11u |\
tl-mr12u |\
tl-mr13u |\
tl-mr3020 |\
tl-mr3040 |\
tl-mr3040-v2 |\
tl-wa701nd-v2 |\
tl-wa7210n-v2 |\
tl-wa750re |\
tl-wa850re |\
tl-wa830re-v2 |\
tl-wa801nd-v2 |\
tl-wa901nd |\
tl-wa901nd-v2 |\
tl-wa901nd-v3 |\
tl-wa901nd-v4 |\
tl-wr703n |\
tube2h |\
unifiac-lite |\
wndap360 |\
mynet-rext |\
wp543)
ucidef_set_interface_lan "eth0"
;;
cap324)
cap324)
ucidef_set_interface_lan "eth0" "dhcp"
;;
arduino-yun |\
tl-wa801nd-v3 |\
dir-505-a1)
arduino-yun |\
tl-wa801nd-v3 |\
dir-505-a1)
ucidef_set_interface_lan "eth1"
;;
alfa-ap96 |\
alfa-nx |\
ap83 |\
gl-ar150 |\
gl-ar300m |\
gl-domino |\
gl-inet |\
gl-mifi |\
jwap003 |\
pb42 |\
pb44 |\
routerstation|\
tl-wr710n |\
tl-wr720n-v3|\
tl-wr810n |\
wpe72 |\
wrtnode2q)
alfa-ap96 |\
alfa-nx |\
ap83 |\
gl-ar150 |\
gl-ar300m |\
gl-domino |\
gl-inet |\
gl-mifi |\
jwap003 |\
pb42 |\
pb44 |\
routerstation|\
tl-wr710n |\
tl-wr720n-v3|\
tl-wr810n |\
wpe72 |\
wrtnode2q)
ucidef_set_interfaces_lan_wan "eth1" "eth0"
;;
gl-ar300)
gl-ar300)
ucidef_set_interfaces_lan_wan "eth1" "eth0"
ucidef_add_switch "switch0" \
"0@eth1" "1:lan" "2:lan" "3:lan" "4:lan"
;;
jwap230)
jwap230)
ucidef_set_interfaces_lan_wan "eth0" "eth1"
ucidef_add_switch "switch0" \
"0@eth0" "1:lan" "5:wan" "6@eth1"
;;
wpj342)
wpj342)
ucidef_add_switch "switch0" \
"0@eth0" "1:lan" "2:wan"
;;
wpj344)
wpj344)
ucidef_add_switch "switch0" \
"0@eth0" "3:lan" "2:wan"
;;
unifiac-pro)
unifiac-pro)
ucidef_add_switch "switch0" \
"0@eth0" "2:lan" "3:wan"
;;
dr531 |\
wpj531)
dr531 |\
wpj531)
ucidef_set_interfaces_lan_wan "eth0" "eth1"
;;
wpj558)
wpj558)
ucidef_add_switch "switch0" \
"5:lan" "1:wan" "6@eth0"
;;
ap121 |\
ap121-mini |\
ap96 |\
airrouter |\
dir-600-a1 |\
dir-615-c1 |\
dir-615-e1 |\
dir-615-e4 |\
hiwifi-hc6361 |\
ja76pf |\
mc-mac1200r|\
minibox-v1 |\
mynet-n600 |\
oolite |\
qihoo-c301 |\
rb-750 |\
rb-751 |\
som9331 |\
tew-632brp |\
tew-712br |\
tew-732br |\
tl-mr3220 |\
tl-mr3220-v2 |\
tl-mr3420 |\
tl-wdr3320-v2 |\
tl-wdr3500 |\
tl-wr741nd |\
tl-wr741nd-v4 |\
tl-wr841n-v7 |\
tl-wr841n-v9 |\
tl-wr841n-v11 |\
tl-wr842n-v3 |\
whr-g301n |\
whr-hp-g300n |\
whr-hp-gn |\
wzr-hp-ag300h |\
zbt-we1526)
ap121 |\
ap121-mini |\
ap96 |\
airrouter |\
dir-600-a1 |\
dir-615-c1 |\
dir-615-e1 |\
dir-615-e4 |\
hiwifi-hc6361 |\
ja76pf |\
mc-mac1200r|\
minibox-v1 |\
mynet-n600 |\
oolite |\
qihoo-c301 |\
rb-750 |\
rb-751 |\
som9331 |\
tew-632brp |\
tew-712br |\
tew-732br |\
tl-mr3220 |\
tl-mr3220-v2 |\
tl-mr3420 |\
tl-wdr3320-v2 |\
tl-wdr3500 |\
tl-wr741nd |\
tl-wr741nd-v4 |\
tl-wr841n-v7 |\
tl-wr841n-v9 |\
tl-wr841n-v11 |\
tl-wr842n-v3 |\
whr-g301n |\
whr-hp-g300n |\
whr-hp-gn |\
wzr-hp-ag300h |\
zbt-we1526)
ucidef_set_interfaces_lan_wan "eth0" "eth1"
ucidef_add_switch "switch0" \
"0@eth0" "1:lan:4" "2:lan:3" "3:lan:2" "4:lan:1"
;;
wzr-hp-g450h)
wzr-hp-g450h)
ucidef_add_switch "switch0" \
"0@eth0" "2:lan:1 3:lan:2 4:lan:3 5:lan:4" "1:wan"
;;
ew-dorin)
ew-dorin)
ucidef_add_switch "switch0" \
"0@eth0" "1:lan" "2:lan" "3:wan"
;;
ew-dorin-router)
ew-dorin-router)
ucidef_set_interfaces_lan_wan "eth0" "eth1"
ucidef_add_switch "switch0" "0@eth0" "2:lan" "3:lan"
;;
wndr3700)
wndr3700)
ucidef_set_interfaces_lan_wan "eth0" "eth1"
ucidef_add_switch "switch0" \
"0:lan" "1:lan" "2:lan" "3:lan" "5@eth0"
@ -538,17 +524,52 @@ wndr3700)
ucidef_add_switch_port_attr "switch0" 5 led 2
;;
z1)
z1)
ucidef_set_interfaces_lan_wan "eth0" "eth1"
ucidef_add_switch "switch0" \
"0@eth0" "1:lan:1" "2:lan:2" "3:lan:3" "4:lan:4" "5:wan"
;;
*)
*)
ucidef_set_interfaces_lan_wan "eth0" "eth1"
;;
esac
esac
}
ar71xx_setup_macs()
{
local board="$1"
local lan_mac=""
local wan_mac=""
case $board in
dgl-5500-a1|\
dir-825-c1)
wan_mac=$(mtd_get_mac_ascii nvram "wan_mac")
;;
dhp-1565-a1|\
dir-835-a1|\
wndr3700v4|\
wndr4300)
lan_mac=$(mtd_get_mac_binary caldata 0)
wan_mac=$(mtd_get_mac_binary caldata 6)
;;
esr900)
wan_mac=$(mtd_get_mac_ascii u-boot-env "wanaddr")
;;
mynet-n750)
wan_mac=$(mtd_get_mac_ascii devdata "wanmac")
;;
esac
[ -n "$lan_mac" ] && ucidef_set_interface_macaddr "lan" $lan_mac
[ -n "$wan_mac" ] && ucidef_set_interface_macaddr "wan" $wan_mac
}
board_config_update
board=$(ar71xx_board_name)
ar71xx_setup_interfaces $board
ar71xx_setup_macs $board
board_config_flush
exit 0