summaryrefslogtreecommitdiffstats
path: root/target/linux
diff options
context:
space:
mode:
authornbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>2008-06-15 11:10:13 +0000
committernbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>2008-06-15 11:10:13 +0000
commitf8338897616e0fe6e7213778fd1ef3d064afb77e (patch)
treed77cf76d84d5642678691546e0e0be844c68a46c /target/linux
parent8d0837caa22ef76b3b8653602197b3f9d80ba235 (diff)
(3/6) bcm57xx: preinit
This patch allows the bcm57xx module to work correctly with failsafe mode. insmod doesn't return an error when a module loads but doesn't detect a switch. I added the check_module function to load the module, then make sure it doesn't just exit immediately. This allows preinit to only attempt to load the bcm57xx module when switch-robo and switch-adm dont detect a switch. The activate_gpio parameter to bcm57xx simply instructs the module to attempt to activate the switch via gpio before probing for the switch. Tested on wrt350n. Signed-off-by: Ben Pfountz <netprince (at) vt (dot) edu> git-svn-id: svn://svn.openwrt.org/openwrt/trunk@11468 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux')
-rwxr-xr-xtarget/linux/brcm-2.4/base-files/etc/preinit.arch17
1 files changed, 14 insertions, 3 deletions
diff --git a/target/linux/brcm-2.4/base-files/etc/preinit.arch b/target/linux/brcm-2.4/base-files/etc/preinit.arch
index 5127e6088..1b3c924ce 100755
--- a/target/linux/brcm-2.4/base-files/etc/preinit.arch
+++ b/target/linux/brcm-2.4/base-files/etc/preinit.arch
@@ -4,7 +4,7 @@ failsafe() {
lock /tmp/.failsafe
failsafe_ip
- echo "0 1 2 3 4 5u*" > /proc/switch/eth0/vlan/0/ports
+ echo "0 1 2 3 4 ${cpu_port:-5u*}" > /proc/switch/eth0/vlan/0/ports
set_state failsafe
[ -x "/usr/sbin/nvram" ] && {
@@ -39,8 +39,19 @@ esac
failsafe_ip
+check_module () {
+ module="$1"; shift; params="$*"
+
+ insmod "$module" "$params"
+ sleep 1
+ grep "^$module" /proc/modules
+ return $?
+}
+
insmod switch-core
-insmod switch-robo || insmod switch-adm || rmmod switch-core
+check_module switch-robo || check_module switch-adm || {
+ check_module bcm57xx activate_gpio=0x4 && cpu_port="8u*"
+} || rmmod switch-core
[ -d /proc/switch/eth0 ] && {
echo 1 > /proc/switch/eth0/reset
@@ -48,7 +59,7 @@ insmod switch-robo || insmod switch-adm || rmmod switch-core
# this would be easier if we blasted the message across all ports
# but we don't want packets leaking across interfaces
for port in $(seq 0 4); do {
- echo "$port 5u*" > /proc/switch/eth0/vlan/0/ports
+ echo "$port ${cpu_port:-5u*}" > /proc/switch/eth0/vlan/0/ports
netmsg 192.168.1.255 "Press reset now, to enter Failsafe!"
}; done
} || netmsg 192.168.1.255 "Press reset now, to enter Failsafe!"