lantiq: move common DSL setup into lantiq.sh

DSL setup consists of the same commands for all subtargets, so move it
into a helper function.

While at it, remove shebang from library file.

Signed-off-by: Adrian Schmutzler <[email protected]>

target/linux/lantiq/ase/base-files/etc/board.d/02_network

@@ -32,16 +32,7 @@ netgear,dgn1000b)
 	;;
 esac
 
-ls /lib/modules/$(uname -r)/ltq_atm* 1> /dev/null 2>&1 && \
-	ucidef_add_atm_bridge 1 32 "llc" "bridged" "dsl"
-
-if lantiq_is_vdsl_system; then
-	ucidef_add_vdsl_modem "$annex" "av"
-else
-	ucidef_add_adsl_modem "$annex" "/lib/firmware/adsl.bin"
-fi
-
-ucidef_set_interface_wan "dsl0" "pppoe"
+lantiq_setup_dsl_helper "$annex"
 
 [ -n "$lan_mac" ] && ucidef_set_interface_macaddr "lan" "$lan_mac"
 [ -n "$wan_mac" ] && ucidef_set_interface_macaddr "wan" "$wan_mac"

target/linux/lantiq/base-files/lib/functions/lantiq.sh

@@ -1,5 +1,18 @@
-#!/bin/sh
-
 lantiq_is_vdsl_system() {
 	grep -qE "system type.*: (VR9|xRX200)" /proc/cpuinfo
 }
+
+lantiq_setup_dsl_helper() {
+	local annex="$1"
+
+	ls /lib/modules/$(uname -r)/ltq_atm* 1> /dev/null 2>&1 && \
+		ucidef_add_atm_bridge "1" "32" "llc" "bridged" "dsl"
+
+	if lantiq_is_vdsl_system; then
+		ucidef_add_vdsl_modem "$annex" "av"
+	else
+		ucidef_add_adsl_modem "$annex" "/lib/firmware/adsl.bin"
+	fi
+
+	ucidef_set_interface_wan "dsl0" "pppoe"
+}

target/linux/lantiq/falcon/base-files/etc/board.d/02_network

@@ -16,16 +16,7 @@ wan_mac=""
 
 ucidef_set_interface_lan 'eth0'
 
-ls /lib/modules/$(uname -r)/ltq_atm* 1> /dev/null 2>&1 && \
-	ucidef_add_atm_bridge 1 32 "llc" "bridged" "dsl"
-
-if lantiq_is_vdsl_system; then
-	ucidef_add_vdsl_modem "$annex" "av"
-else
-	ucidef_add_adsl_modem "$annex" "/lib/firmware/adsl.bin"
-fi
-
-ucidef_set_interface_wan "dsl0" "pppoe"
+lantiq_setup_dsl_helper "$annex"
 
 [ -n "$lan_mac" ] && ucidef_set_interface_macaddr "lan" "$lan_mac"
 [ -n "$wan_mac" ] && ucidef_set_interface_macaddr "wan" "$wan_mac"

target/linux/lantiq/xrx200/base-files/etc/board.d/02_network

@@ -123,16 +123,7 @@ zyxel,p-2812hnu-f3)
 	;;
 esac
 
-ls /lib/modules/$(uname -r)/ltq_atm* 1> /dev/null 2>&1 && \
-	ucidef_add_atm_bridge 1 32 "llc" "bridged" "dsl"
-
-if lantiq_is_vdsl_system; then
-	ucidef_add_vdsl_modem "$annex" "av"
-else
-	ucidef_add_adsl_modem "$annex" "/lib/firmware/adsl.bin"
-fi
-
-ucidef_set_interface_wan "dsl0" "pppoe"
+lantiq_setup_dsl_helper "$annex"
 
 [ -n "$lan_mac" ] && ucidef_set_interface_macaddr "lan" "$lan_mac"
 [ -n "$wan_mac" ] && ucidef_set_interface_macaddr "wan" "$wan_mac"

target/linux/lantiq/xway/base-files/etc/board.d/02_network

@@ -102,16 +102,7 @@ zyxel,p-2601hn)
 	;;
 esac
 
-ls /lib/modules/$(uname -r)/ltq_atm* 1> /dev/null 2>&1 && \
-	ucidef_add_atm_bridge 1 32 "llc" "bridged" "dsl"
-
-if lantiq_is_vdsl_system; then
-	ucidef_add_vdsl_modem "$annex" "av"
-else
-	ucidef_add_adsl_modem "$annex" "/lib/firmware/adsl.bin"
-fi
-
-ucidef_set_interface_wan "dsl0" "pppoe"
+lantiq_setup_dsl_helper "$annex"
 
 [ -n "$lan_mac" ] && ucidef_set_interface_macaddr "lan" "$lan_mac"
 [ -n "$wan_mac" ] && ucidef_set_interface_macaddr "wan" "$wan_mac"

target/linux/lantiq/xway_legacy/base-files/etc/board.d/02_network

@@ -32,16 +32,7 @@ arcadyan,arv452cqw)
 	;;
 esac
 
-ls /lib/modules/$(uname -r)/ltq_atm* 1> /dev/null 2>&1 && \
-	ucidef_add_atm_bridge 1 32 "llc" "bridged" "dsl"
-
-if lantiq_is_vdsl_system; then
-	ucidef_add_vdsl_modem "$annex" "av"
-else
-	ucidef_add_adsl_modem "$annex" "/lib/firmware/adsl.bin"
-fi
-
-ucidef_set_interface_wan "dsl0" "pppoe"
+lantiq_setup_dsl_helper "$annex"
 
 [ -n "$lan_mac" ] && ucidef_set_interface_macaddr "lan" "$lan_mac"
 [ -n "$wan_mac" ] && ucidef_set_interface_macaddr "wan" "$wan_mac"