From: Mathias Kresin <dev@kresin.me>
Date: Mon, 16 Oct 2017 21:25:04 +0000 (+0200)
Subject: lantiq: match default adsl annex and firmware
X-Git-Tag: v18.06.0-rc1~1938
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=664369f6b281b961718b247e3b6b2d55fc6a5f7a;p=openwrt%2Fstaging%2Fchunkeey.git

lantiq: match default adsl annex and firmware

Set a default Annex matching the the annex of the selected adsl
firmware.

Set Annex B for xrx200 board which are known to have an ADSL hybrid for
Annex B.

Signed-off-by: Mathias Kresin <dev@kresin.me>
---

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 f78ef2fd36..8c2a118d96 100755
--- a/target/linux/lantiq/base-files/etc/board.d/02_network
+++ b/target/linux/lantiq/base-files/etc/board.d/02_network
@@ -23,7 +23,7 @@ interface_wan=""
 board=$(board_name)
 
 case "$board" in
-ACMP252|GIGASX76X)
+ACMP252)
 	ucidef_add_switch "switch0" \
 		"1:lan:4" "2:lan:3" "3:lan:2" "4:lan:1" "5t@eth0"
 	;;
@@ -42,17 +42,24 @@ ARV4510PW)
 		"0:lan:4" "2:lan:2" "1:lan:3" "3:lan:1" "5t@eth0"
 	;;
 
-ARV4519PW|ARV7510PW22|ARV7518PW|ARV752DPW22|ARV8539PW22)
+ARV4519PW|ARV7510PW22|ARV7518PW)
 	ucidef_add_switch "switch0" \
 		"0t@eth0" "2:lan" "3:lan" "4:lan" "5:lan"
 	;;
 
 ARV4520PW)
+	annex="b"
 	ucidef_add_switch "switch0" \
 		"0:lan:4" "1:lan:3" "2:lan:2" "3:lan:1" "5t@eth0"
 	;;
 
+ARV4525PW|ARV452CQW|ARV7525PW|ARV752DPW)
+	annex="b"
+	ucidef_set_interface_lan 'eth0'
+	;;
+
 ARV7506PW11)
+	annex="b"
 	wan_mac=$(macaddr_add "$(mtd_get_mac_binary board_config 22)" 2)
 	ucidef_add_switch "switch0" \
 		"1:lan:4" "2:lan:3" "3:lan:2" "4:lan:1" "5t@eth0"
@@ -70,6 +77,12 @@ ARV7519RW22)
 		"0:lan:5" "2:lan:3" "3:lan:4" "4:lan:1" "5:lan:2" "6t@eth0"
 	;;
 
+ARV752DPW22|ARV8539PW22)
+	annex="b"
+	ucidef_add_switch "switch0" \
+		"0t@eth0" "2:lan" "3:lan" "4:lan" "5:lan"
+	;;
+
 ASL56026)
 	lan_mac=$(mtd_get_mac_ascii uboot_env ethaddr)
 	wan_mac=$(mtd_get_mac_ascii uboot_env wanmac)
@@ -97,6 +110,11 @@ BTHOMEHUBV5A)
 		"0:lan:3" "1:lan:4" "2:lan:2" "4:lan:1" "5:wan:5" "6t@eth0"
 	;;
 
+DGN1000B)
+	annex="b"
+	ucidef_set_interface_lan 'eth0'
+	;;
+
 DGN3500*)
 	ucidef_add_switch "switch0" \
 		"0:lan:4" "1:lan:3" "2:lan:2" "3:lan:1" "5t@eth0"
@@ -116,22 +134,32 @@ EASY80920NAND|EASY80920NOR)
 	;;
 
 FRITZ3370)
+	annex="b"
 	wan_mac=$(macaddr_add "$(mtd_get_mac_binary urlader 2439)" 1)
 	ucidef_set_interface_lan 'eth0'
 	;;
 
 FRITZ7320)
+	annex="b"
 	wan_mac=$(macaddr_add "$(mtd_get_mac_binary urlader 2705)" 1)
 	ucidef_set_interface_lan 'eth0'
 	;;
 
 FRITZ7360SL)
+	annex="b"
 	wan_mac=$(macaddr_add "$(mtd_get_mac_binary urlader 2705)" 1)
 	ucidef_add_switch "switch0" \
 		"0:lan:3" "1:lan:4" "2:lan:2" "4:lan:1" "6t@eth0"
 	;;
 
+GIGASX76X)
+	annex="b"
+	ucidef_add_switch "switch0" \
+		"1:lan:4" "2:lan:3" "3:lan:2" "4:lan:1" "5t@eth0"
+	;;
+
 H201L)
+	annex="b"
 	ucidef_add_switch "switch0" \
 		"0:lan" "1:lan" "2:lan" "3:lan" "4t@eth0"
 	;;
@@ -168,6 +196,7 @@ VR200v)
 	;;
 
 VGV7510KW22*)
+	annex="b"
 	wan_mac=$(macaddr_add "$(mtd_get_mac_binary board_config 22)" 2)
 	ucidef_add_switch "switch0" \
 		"2:lan:2" "3:lan:1" "4:lan:4" "5:lan:3" "0:wan:5" "6t@eth0"