brcm47xx: remove target specific network preinit config
authorJo-Philipp Wich <jo@mein.io>
Wed, 17 May 2017 12:36:23 +0000 (14:36 +0200)
committerJo-Philipp Wich <jo@mein.io>
Wed, 13 Dec 2017 17:50:55 +0000 (18:50 +0100)
The generic preinit code is now able to setup network and switch vlan settings
from the /etc/board.json file, therefor drop the target specific code.

Fixes FS#790.

Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit 833c500cb2985e9b76a1aae3b6a577977eee5457)

target/linux/brcm47xx/base-files/lib/preinit/05_init_interfaces_brcm [deleted file]
target/linux/brcm47xx/base-files/lib/preinit/15_set_preinit_interface_brcm [deleted file]

diff --git a/target/linux/brcm47xx/base-files/lib/preinit/05_init_interfaces_brcm b/target/linux/brcm47xx/base-files/lib/preinit/05_init_interfaces_brcm
deleted file mode 100644 (file)
index 4b0d0eb..0000000
+++ /dev/null
@@ -1,16 +0,0 @@
-#!/bin/sh
-
-preinit_iface() {
-       ifname=eth0
-
-       # hardware specific overrides
-       case "$(awk 'BEGIN{FS="[ \t]+:[ \t]"} /machine/ {print $2}' /proc/cpuinfo)" in
-               "Asus WLHDD") ifname=eth1;;
-               "Asus WL300G") ifname=eth1;;
-       esac
-
-       local try=0;
-       while [ $((try++)) -le 5 ] && [ ! -f /sys/class/net/$ifname/operstate ]; do sleep 1; done
-}
-
-boot_hook_add preinit_main preinit_iface
diff --git a/target/linux/brcm47xx/base-files/lib/preinit/15_set_preinit_interface_brcm b/target/linux/brcm47xx/base-files/lib/preinit/15_set_preinit_interface_brcm
deleted file mode 100644 (file)
index f40e160..0000000
+++ /dev/null
@@ -1,16 +0,0 @@
-#!/bin/sh
-
-preinit_ip() {
-       # if the preinit interface isn't specified and ifname is set in
-       # preinit.arch use that interface
-       if [ -z "$pi_ifname" ]; then
-               pi_ifname=$ifname
-       fi
-
-       [ -n "$pi_ifname" ] && grep -q "$pi_ifname" /proc/net/dev && {
-               ifconfig $pi_ifname $pi_ip netmask $pi_netmask broadcast $pi_broadcast up
-
-               local try=0;
-               while [ $((try++)) -le 5 ] && [ ! "$(cat /sys/class/net/$pi_ifname/operstate)" = "up" ]; do sleep 1; done
-       }
-}