Changeset 2984


Ignore:
Timestamp:
2006-01-14T21:27:34+01:00 (12 years ago)
Author:
nbd
Message:

switch whiterussian over to b44 and kmod-switch, use netmsg to send messages for failsafe mode (should fix #76 and #86)

Location:
branches/whiterussian/openwrt
Files:
11 edited

Legend:

Unmodified
Added
Removed
  • branches/whiterussian/openwrt/package/base-files/Makefile

    r2361 r2984  
    44 
    55PKG_NAME:=base-files 
    6 PKG_RELEASE:=5 
     6PKG_RELEASE:=6 
    77PKG_BUILD_DIR:=$(BUILD_DIR)/base-files 
    88 
  • branches/whiterussian/openwrt/package/base-files/default/etc/init.d/S10boot

    r1712 r2984  
    1212ifconfig eth0 promisc 
    1313 
     14# configure the switch based on nvram if not in failsafe mode 
     15[ -d /proc/switch/eth0 -a -z "$FAILSAFE" ] && { 
     16        for nr in `seq 0 15`; do 
     17                vp="$(nvram get vlan${nr}ports)" 
     18                [ -z "$vp" -o -z "$(nvram get vlan${nr}hwname)" ] || { 
     19                        echo "$vp" > /proc/switch/eth0/vlan/$nr/ports 
     20                } 
     21        done 
     22} 
     23 
    1424HOSTNAME=$(nvram get wan_hostname) 
    1525HOSTNAME=${HOSTNAME%%.*} 
  • branches/whiterussian/openwrt/package/base-files/default/etc/nvram.overrides

    r2099 r2984  
    2828[ "$FAILSAFE" = "true" ] && { 
    2929  echo "### YOU ARE IN FAILSAFE MODE ####" 
    30   NVRAM_lan_ifname="br0" 
    31   NVRAM_lan_ifnames=$FAILSAFE_ifnames 
     30  NVRAM_lan_ifname="eth0" 
    3231  NVRAM_lan_ipaddr=${BR2_SYSCONF_FAILSAFE_IP:-"192.168.1.1"} 
    3332  NVRAM_lan_netmask=${BR2_SYSCONF_FAILSAFE_NETMASK:-"255.255.255.0"} 
  • branches/whiterussian/openwrt/package/base-files/default/etc/preinit

    r1629 r2984  
    44insmod diag 
    55echo 0x01 > /proc/sys/diag 
    6 sleep 1 
     6 
     7ifconfig eth0 up 
     8insmod switch-core 
     9insmod switch-robo || insmod switch-adm || rmmod switch-core 
     10 
     11[ -d /proc/switch/eth0 ] && { 
     12        echo 1 > /proc/switch/eth0/reset 
     13        echo "0 1 2 3 4 5u*" > /proc/switch/eth0/vlan/0/ports 
     14} 
     15 
     16# this delay is apparently necessary because the link isn't up yet 
     17ifconfig eth0 192.168.1.1 netmask 255.255.255.0 broadcast 192.168.1.255 up 
     18netmsg 192.168.1.0 "(dummy message)" # b44 eats the first packet 
     19netmsg 192.168.1.255 "Press reset now, to enter Failsafe!" 
     20 
     21sleep 2 
     22 
    723if [ $(cat /proc/sys/reset) = 1 -o "$(nvram get failsafe)" = 1 ]; then 
    824        export FAILSAFE=true 
     
    1228        } 
    1329        while :; do { echo $(((X=(X+1)%8)%2)) > /proc/sys/diag; sleep $((X==0)); } done & 
     30        netmsg 192.168.1.255 "Entering Failsafe!" 
     31else 
     32        netmsg 192.168.1.255 "Normal startup." 
    1433fi 
    1534 
    1635mount_root ${FAILSAFE:+failsafe} 
    1736 
     37# remove the drivers for now, just in case the user has newer versions on the jffs2 partition 
     38rmmod switch-robo 
     39rmmod switch-adm 
     40rmmod switch-core 
     41ifconfig eth0 0.0.0.0 
     42 
    1843exec /sbin/init 
  • branches/whiterussian/openwrt/target/linux/Config.in

    r2933 r2984  
    3333        tristate "Broadcom Ethernet Driver" 
    3434        depends BR2_LINUX_2_4_BRCM 
    35         default y 
     35        default m 
    3636        help 
    3737          Proprietary driver for Broadcom Ethernet chipsets 
    38  
    39 config BR2_PACKAGE_KMOD_B44 
    40         tristate "Broadcom 44XX, 47XX ethernet driver" 
    41         default m 
    42         help 
    43           Free driver for Broadcom Ethernet chipsets (without switch support) 
    4438 
    4539config BR2_PACKAGE_KMOD_ARPT 
  • branches/whiterussian/openwrt/target/linux/imagebuilder/lists/default.brcm-2.4

    r2664 r2984  
    99iptables 
    1010iwlib 
    11 kmod-brcm-et 
    1211kmod-brcm-wl 
    1312kmod-diag 
    1413kmod-ppp 
    1514kmod-pppoe 
     15kmod-switch 
    1616kmod-wlcompat 
    1717libgcc 
  • branches/whiterussian/openwrt/target/linux/imagebuilder/lists/micro.brcm-2.4

    r2664 r2984  
    88iptables 
    99iwlib 
    10 kmod-brcm-et 
    1110kmod-brcm-wl 
    1211kmod-diag 
     12kmod-switch 
    1313kmod-wlcompat 
    1414libgcc 
  • branches/whiterussian/openwrt/target/linux/imagebuilder/lists/pptp.brcm-2.4

    r2664 r2984  
    99iptables 
    1010iwlib 
    11 kmod-brcm-et 
    1211kmod-brcm-wl 
    1312kmod-diag 
    1413kmod-ppp 
    1514kmod-gre 
     15kmod-switch 
    1616kmod-wlcompat 
    1717libgcc 
  • branches/whiterussian/openwrt/target/linux/linux-2.4/Makefile

    r2957 r2984  
    3434 
    3535PKG_BUILD_DIR := $(LINUX_BUILD_DIR)/linux-modules 
    36 PKG_RELEASE := 2 
     36PKG_RELEASE := 3 
    3737 
    3838KERNEL_IPKG:=$(LINUX_BUILD_DIR)/kernel_$(LINUX_VERSION)-$(BOARD)-$(PKG_RELEASE)_$(ARCH).ipk 
  • branches/whiterussian/openwrt/target/linux/linux-2.4/config/brcm

    r2933 r2984  
    734734# CONFIG_ADAPTEC_STARFIRE is not set 
    735735# CONFIG_APRICOT is not set 
    736 CONFIG_B44=m 
     736CONFIG_B44=y 
    737737CONFIG_ET=m 
    738738# CONFIG_CS89x0 is not set 
  • branches/whiterussian/openwrt/target/linux/linux-2.4/config/brcm.modules

    r1195 r2984  
    1 et 
    21wl 
Note: See TracChangeset for help on using the changeset viewer.