diff options
Diffstat (limited to 'target/linux/brcm47xx/base-files/lib')
7 files changed, 7 insertions, 16 deletions
diff --git a/target/linux/brcm47xx/base-files/lib/preinit/03_init_hotplug_failsafe_brcm b/target/linux/brcm47xx/base-files/lib/preinit/03_init_hotplug_failsafe_brcm index b0f4a4efa..a930b7eb4 100644 --- a/target/linux/brcm47xx/base-files/lib/preinit/03_init_hotplug_failsafe_brcm +++ b/target/linux/brcm47xx/base-files/lib/preinit/03_init_hotplug_failsafe_brcm @@ -5,5 +5,3 @@ init_hotplug_failsafe() { } boot_hook_add preinit_main init_hotplug_failsafe - - 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 index 3cd760e2d..038a415a6 100644 --- a/target/linux/brcm47xx/base-files/lib/preinit/05_init_interfaces_brcm +++ b/target/linux/brcm47xx/base-files/lib/preinit/05_init_interfaces_brcm @@ -28,7 +28,7 @@ check_module () { init_iface() { check_module tg3 insmod switch-core - check_module switch-robo || check_module switch-adm || { + check_module switch-robo || check_module switch-adm || { check_module bcm57xx activate_gpio=0x4 && cpu_port="8u*" } || rmmod switch-core } diff --git a/target/linux/brcm47xx/base-files/lib/preinit/05_reset_button_brcm b/target/linux/brcm47xx/base-files/lib/preinit/05_reset_button_brcm index 5a5ffe96c..5aa7bc0b1 100644 --- a/target/linux/brcm47xx/base-files/lib/preinit/05_reset_button_brcm +++ b/target/linux/brcm47xx/base-files/lib/preinit/05_reset_button_brcm @@ -5,4 +5,3 @@ enable_reset_button() { } boot_hook_add preinit_main enable_reset_button - diff --git a/target/linux/brcm47xx/base-files/lib/preinit/05_set_failsafe_switch_brcm b/target/linux/brcm47xx/base-files/lib/preinit/05_set_failsafe_switch_brcm index a93559f97..c7d0fc8da 100644 --- a/target/linux/brcm47xx/base-files/lib/preinit/05_set_failsafe_switch_brcm +++ b/target/linux/brcm47xx/base-files/lib/preinit/05_set_failsafe_switch_brcm @@ -5,11 +5,10 @@ failsafe_ip() { ifconfig eth0 0.0.0.0 down echo "0 1 2 3 4 ${cpu_port:-5u*}" > /proc/switch/eth0/vlan/0/ports } - + [ -n "$pi_ifname" ] && grep -q "$pi_ifname" /proc/net/dev && { - ifconfig $pi_ifname $pi_ip netmask $pi_netmask broadcast $pi_broadcast up + ifconfig $pi_ifname $pi_ip netmask $pi_netmask broadcast $pi_broadcast up } } boot_hook_add failsafe failsafe_ip - diff --git a/target/linux/brcm47xx/base-files/lib/preinit/15_mount_proc_brcm b/target/linux/brcm47xx/base-files/lib/preinit/15_mount_proc_brcm index fd5add16a..923c98fd4 100644 --- a/target/linux/brcm47xx/base-files/lib/preinit/15_mount_proc_brcm +++ b/target/linux/brcm47xx/base-files/lib/preinit/15_mount_proc_brcm @@ -3,4 +3,3 @@ do_mount_procfs() { mount none /proc -t proc } - 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 index a0a303346..0a8915080 100644 --- 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 @@ -2,7 +2,7 @@ port_net_echo() { [ -n "$pi_ifname" ] && grep -q "$pi_ifname" /proc/net/dev && { - if [ "$pi_preinit_net_messages" = "y" ] || [ "$pi_failsafe_net_message" = "true" ] && [ "$pi_preinit_no_failsafe_netmsg" != "y" ]; then + if [ "$pi_preinit_net_messages" = "y" ] || [ "$pi_failsafe_net_message" = "true" ] && [ "$pi_preinit_no_failsafe_netmsg" != "y" ]; then netmsg $pi_broadcast "$1" fi } @@ -20,7 +20,7 @@ preinit_ip_deconfig() { preinit_net_echo() { preinit_ip - + [ -d /proc/switch/eth0 ] && [ "$pi_ifname" = "eth0" ] && { echo 1 > /proc/switch/eth0/reset @@ -30,10 +30,8 @@ preinit_net_echo() { echo "$port ${cpu_port:-5u*}" > /proc/switch/eth0/vlan/0/ports port_net_echo $1 }; done - + echo "0 1 2 3 4 ${cpu_port:-5u*}" > /proc/switch/eth0/vlan/0/ports - + } || port_net_echo $1 } - - diff --git a/target/linux/brcm47xx/base-files/lib/preinit/20_failsafe_net_echo_brcm b/target/linux/brcm47xx/base-files/lib/preinit/20_failsafe_net_echo_brcm index f030cb283..2b0d2cccc 100644 --- a/target/linux/brcm47xx/base-files/lib/preinit/20_failsafe_net_echo_brcm +++ b/target/linux/brcm47xx/base-files/lib/preinit/20_failsafe_net_echo_brcm @@ -8,5 +8,3 @@ indicate_failsafe() { preinit_net_echo "Entering Failsafe!\n" indicate_failsafe_led } - - |