projects
/
openwrt
/
svn-archive
/
archive.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
0f540bc
)
brcm47xx: whitespace cleanups
author
Hauke Mehrtens
<hauke@hauke-m.de>
Sun, 25 Nov 2012 14:03:51 +0000
(14:03 +0000)
committer
Hauke Mehrtens
<hauke@hauke-m.de>
Sun, 25 Nov 2012 14:03:51 +0000
(14:03 +0000)
SVN-Revision: 34329
target/linux/brcm47xx/base-files/lib/preinit/03_init_hotplug_failsafe_brcm
patch
|
blob
|
history
target/linux/brcm47xx/base-files/lib/preinit/05_init_interfaces_brcm
patch
|
blob
|
history
target/linux/brcm47xx/base-files/lib/preinit/05_reset_button_brcm
patch
|
blob
|
history
target/linux/brcm47xx/base-files/lib/preinit/05_set_failsafe_switch_brcm
patch
|
blob
|
history
target/linux/brcm47xx/base-files/lib/preinit/15_mount_proc_brcm
patch
|
blob
|
history
target/linux/brcm47xx/base-files/lib/preinit/15_set_preinit_interface_brcm
patch
|
blob
|
history
target/linux/brcm47xx/base-files/lib/preinit/20_failsafe_net_echo_brcm
patch
|
blob
|
history
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 b0f4a4efa9584e4c69f880062431dd27b8b78b24..a930b7eb4a83855b7211183ed5faf831802ed83f 100644
(file)
--- 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
}
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 3cd760e2db5bc43c8ef85def465caff0e11b041f..038a415a623dd40a1e12f659aad9311c1e028316 100644
(file)
--- 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
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
}
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 5a5ffe96c0ebf70b6286aaf523cdf4b52a3d42b6..5aa7bc0b1d83f033c27d90ab734c883e793631ca 100644
(file)
--- 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
}
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 a93559f97b40a980aeee9bd408269d8d54c6d664..c7d0fc8da842f63a3837cb977f49bca06ca909b7 100644
(file)
--- 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
}
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 && {
[ -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
}
}
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 fd5add16a59a28718b7b68e4e7c192f4d341aa48..923c98fd49591c02a29d0e412146d27cc9ae8f0f 100644
(file)
--- 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
}
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 a0a3033465bd0cd16e453d3a9fa8babebfad983a..0a8915080f3d1494363f67ea1b8e51ab8c633650 100644
(file)
--- 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 && {
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
}
netmsg $pi_broadcast "$1"
fi
}
@@
-20,7
+20,7
@@
preinit_ip_deconfig() {
preinit_net_echo() {
preinit_ip
preinit_net_echo() {
preinit_ip
-
+
[ -d /proc/switch/eth0 ] && [ "$pi_ifname" = "eth0" ] && {
echo 1 > /proc/switch/eth0/reset
[ -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 "$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
echo "0 1 2 3 4 ${cpu_port:-5u*}" > /proc/switch/eth0/vlan/0/ports
-
+
} || port_net_echo $1
}
} || 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 f030cb28371d1ee76b23b2d46bcc60ff58011e0e..2b0d2cccc46a7473129632f735cca64158bc98e2 100644
(file)
--- 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
}
preinit_net_echo "Entering Failsafe!\n"
indicate_failsafe_led
}
-
-