Changeset 578

Show
Ignore:
Timestamp:
09/09/06 17:55:02 (2 years ago)
Author:
wbx
Message:

add it again from another machine, fix some more bugs in startupscripts

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • branches/wbx-target-cleanup/package/Makefile

    r571 r578  
    4242package-$(FWRT_PACKAGE_DHCP6) += dhcp6 
    4343package-$(FWRT_PACKAGE_DHCP_FORWARDER) += dhcp-forwarder 
    44 package-$(FWRT_PACKAGE_BROADCOM_DIAG) += broadcom-diag 
    4544package-$(FWRT_PACKAGE_DNSMASQ) += dnsmasq 
    4645package-$(FWRT_PACKAGE_DOSFSTOOLS) += dosfstools 

  • branches/wbx-target-cleanup/package/broadcom-diag/Makefile

    r573 r578  
    22include $(TOPDIR)/mk/targets.mk 
    33 
    4 PKG_NAME:=              kmod-broadcom-diag 
     4PKG_NAME:=              broadcom-diag 
    55PKG_RELEASE:=           1 
    66WRKBUILD:=              $(BUILD_DIR)/$(PKG_NAME) 
    …… 
    1010include $(TOPDIR)/package/rules.mk 
    1111 
    12 $(eval $(call PKG_template,KMOD_BROADCOM_DIAG,$(PKG_NAME),$(KERNEL_VERSION)-$(BOARD)-$(PKG_RELEASE),$(ARCH),kernel ($(KERNEL_VERSION)-$(BOARD)-$(KERNEL_RELEASE)))) 
     12$(eval $(call PKG_template,KMOD_BROADCOM_DIAG,kmod-$(PKG_NAME),$(KERNEL_VERSION)-$(BOARD)-$(PKG_RELEASE),$(ARCH),kernel ($(KERNEL_VERSION)-$(BOARD)-$(KERNEL_RELEASE)))) 
    1313 
    1414DIAG_FLAGS:=$(TARGET_CFLAGS) -D__KERNEL__ -fno-strict-aliasing -fno-common -fomit-frame-pointer -G 0 \ 

  • branches/wbx-target-cleanup/package/broadcom-diag/ipkg/kmod-broadcom-diag.control

    r573 r578  
    1 Package: kmod-diag 
     1Package: kmod-broadcom-diag 
    22Priority: essential 
    33Section: sys 

  • branches/wbx-target-cleanup/package/broadcom-wl/Makefile

    r563 r578  
    2626$(IPKG_KMOD_BROADCOM_WL): 
    2727        mkdir -p $(IDIR_KMOD_BROADCOM_WL)/etc/modules.d 
    28         @echo "wl" > $(IDIR_KMOD_BROADCOM_WL)/etc/modules.d/S10-broadcom-wl 
     28        @echo "wl" > $(IDIR_KMOD_BROADCOM_WL)/etc/modules.d/10-broadcom-wl 
    2929        install -m0755 -d $(IDIR_KMOD_BROADCOM_WL)/lib/modules/$(KERNEL_VERSION) 
    3030        $(CP) $(WRKBUILD)/wl.$(KERNEL_MOD_SUFFIX) \ 

  • branches/wbx-target-cleanup/target/image/brcm/Makefile

    r550 r578  
    7171ifeq ($(FS),squashfs) 
    7272$(STAGING_DIR)/freewrt-$(BOARD)-$(KERNEL)-$(FS).trx: $(KDIR)/loader.tmp.gz $(KDIR)/root.$(FS) $(KDIR)/vmlinux.lzma 
    73         $(STAGING_DIR)/bin/trx -o $@ $(KDIR)/loader.tmp.gz $(KDIR)/vmlinux.lzma $(TRXALIGN) $(KDIR)/root.$(FS) $(MAKE_TRACE) 
     73        $(STAGING_DIR)/bin/trx -o $@ $(KDIR)/loader.tmp.gz $(KDIR)/vmlinux.lzma $(TRXALIGN) $(KDIR)/root.$(FS) -a 1024 $(MAKE_TRACE) 
    7474endif 
    7575 
    7676ifeq ($(FS),jffs2) 
    7777$(STAGING_DIR)/freewrt-$(BOARD)-$(KERNEL)-$(FS)-64k.trx: $(KDIR)/loader.tmp.gz $(KDIR)/root.$(FS)-64k $(KDIR)/vmlinux.lzma 
    78         $(STAGING_DIR)/bin/trx -o $@ $(KDIR)/loader.tmp.gz $(KDIR)/vmlinux.lzma $(TRXALIGN) $(KDIR)/root.$(FS)-64k $(MAKE_TRACE) 
     78        $(STAGING_DIR)/bin/trx -o $@ $(KDIR)/loader.tmp.gz $(KDIR)/vmlinux.lzma $(TRXALIGN) $(KDIR)/root.$(FS)-64k -a 0x10000 $(MAKE_TRACE) 
    7979 
    8080$(STAGING_DIR)/freewrt-$(BOARD)-$(KERNEL)-$(FS)-128k.trx: $(KDIR)/loader.tmp.gz $(KDIR)/root.$(FS)-128k $(KDIR)/vmlinux.lzma 
    81         $(STAGING_DIR)/bin/trx -o $@ $(KDIR)/loader.tmp.gz $(KDIR)/vmlinux.lzma $(TRXALIGN) $(KDIR)/root.$(FS)-128k $(MAKE_TRACE) 
     81        $(STAGING_DIR)/bin/trx -o $@ $(KDIR)/loader.tmp.gz $(KDIR)/vmlinux.lzma $(TRXALIGN) $(KDIR)/root.$(FS)-128k -a 0x20000 $(MAKE_TRACE) 
    8282endif 
    8383 

  • branches/wbx-target-cleanup/target/linux/Config.in

    r554 r578  
    728728 
    729729source package/broadcom-wl/Config.in 
    730 source package/diag/Config.in 
     730source package/broadcom-diag/Config.in 
    731731source package/madwifi/Config.in 
    732732source package/mini_fo/Config.in 

  • branches/wbx-target-cleanup/target/linux/brcm-2.4/Config.in

    r554 r578  
    66        select FWRT_mipsel 
    77        select FWRT_PACKAGE_KMOD_BROADCOM_WL 
    8         select FWRT_PACKAGE_KMOD_DIAG 
     8        select FWRT_PACKAGE_KMOD_BROADCOM_DIAG 
    99        select FWRT_PACKAGE_KMOD_USB_UHCI 
    1010        select FWRT_PACKAGE_KMOD_WLCOMPAT 
    …… 
    2020        select FWRT_mipsel 
    2121        select FWRT_PACKAGE_KMOD_BROADCOM_WL 
    22         select FWRT_PACKAGE_KMOD_DIAG 
     22        select FWRT_PACKAGE_KMOD_BROADCOM_DIAG 
    2323        select FWRT_PACKAGE_KMOD_SWITCH_ROBO 
    2424        select FWRT_PACKAGE_KMOD_USB_UHCI 
    …… 
    3636        select FWRT_mipsel 
    3737        select FWRT_PACKAGE_KMOD_BROADCOM_WL 
    38         select FWRT_PACKAGE_KMOD_DIAG 
     38        select FWRT_PACKAGE_KMOD_BROADCOM_DIAG 
    3939        select FWRT_PACKAGE_KMOD_SWITCH_ROBO 
    4040        select FWRT_PACKAGE_KMOD_USB_UHCI 
    …… 
    5252        select FWRT_mipsel 
    5353        select FWRT_PACKAGE_KMOD_BROADCOM_WL 
    54         select FWRT_PACKAGE_KMOD_DIAG 
     54        select FWRT_PACKAGE_KMOD_BROADCOM_DIAG 
    5555        select FWRT_PACKAGE_KMOD_SWITCH_ADMTEK 
    5656        select FWRT_PACKAGE_KMOD_WLCOMPAT 
    …… 
    6767        select FWRT_LINUX_2_4_BRCM 
    6868        select FWRT_PACKAGE_KMOD_BROADCOM_WL 
    69         select FWRT_PACKAGE_KMOD_DIAG 
     69        select FWRT_PACKAGE_KMOD_BROADCOM_DIAG 
    7070        select FWRT_PACKAGE_KMOD_SWITCH_ADMTEK 
    7171        select FWRT_PACKAGE_KMOD_WLCOMPAT 
    …… 
    8383        select FWRT_LINUX_2_4_BRCM 
    8484        select FWRT_PACKAGE_KMOD_BROADCOM_WL 
    85         select FWRT_PACKAGE_KMOD_DIAG 
     85        select FWRT_PACKAGE_KMOD_BROADCOM_DIAG 
    8686        select FWRT_PACKAGE_KMOD_SWITCH_ADMTEK 
    8787        select FWRT_PACKAGE_KMOD_WLCOMPAT 
    …… 
    9898        select FWRT_LINUX_2_4_BRCM 
    9999        select FWRT_PACKAGE_KMOD_BROADCOM_WL 
    100         select FWRT_PACKAGE_KMOD_DIAG 
     100        select FWRT_PACKAGE_KMOD_BROADCOM_DIAG 
    101101        select FWRT_PACKAGE_KMOD_SWITCH_ROBO 
    102102        select FWRT_PACKAGE_KMOD_WLCOMPAT 
    …… 
    113113        select FWRT_LINUX_2_4_BRCM 
    114114        select FWRT_PACKAGE_KMOD_BROADCOM_WL 
    115         select FWRT_PACKAGE_KMOD_DIAG 
     115        select FWRT_PACKAGE_KMOD_BROADCOM_DIAG 
    116116        select FWRT_PACKAGE_KMOD_SWITCH_ROBO 
    117117        select FWRT_PACKAGE_KMOD_WLCOMPAT 
    …… 
    128128        select FWRT_LINUX_2_4_BRCM 
    129129        select FWRT_PACKAGE_KMOD_BROADCOM_WL 
    130         select FWRT_PACKAGE_KMOD_DIAG 
     130        select FWRT_PACKAGE_KMOD_BROADCOM_DIAG 
    131131        select FWRT_PACKAGE_KMOD_SWITCH_ADMTEK 
    132132        select FWRT_PACKAGE_KMOD_WLCOMPAT 
    …… 
    143143        select FWRT_LINUX_2_4_BRCM 
    144144        select FWRT_PACKAGE_KMOD_BROADCOM_WL 
    145         select FWRT_PACKAGE_KMOD_DIAG 
     145        select FWRT_PACKAGE_KMOD_BROADCOM_DIAG 
    146146        select FWRT_PACKAGE_KMOD_SWITCH_ROBO 
    147147        select FWRT_PACKAGE_KMOD_WLCOMPAT 
    …… 
    158158        select FWRT_LINUX_2_4_BRCM 
    159159        select FWRT_PACKAGE_KMOD_BROADCOM_WL 
    160         select FWRT_PACKAGE_KMOD_DIAG 
     160        select FWRT_PACKAGE_KMOD_BROADCOM_DIAG 
    161161        select FWRT_PACKAGE_KMOD_SWITCH_ROBO 
    162162        select FWRT_PACKAGE_KMOD_WLCOMPAT 
    …… 
    173173        select FWRT_LINUX_2_4_BRCM 
    174174        select FWRT_PACKAGE_KMOD_BROADCOM_WL 
    175         select FWRT_PACKAGE_KMOD_DIAG 
     175        select FWRT_PACKAGE_KMOD_BROADCOM_DIAG 
    176176        select FWRT_PACKAGE_KMOD_SWITCH_ROBO 
    177177        select FWRT_PACKAGE_KMOD_WLCOMPAT 
    …… 
    188188        select FWRT_LINUX_2_4_BRCM 
    189189        select FWRT_PACKAGE_KMOD_BROADCOM_WL 
    190         select FWRT_PACKAGE_KMOD_DIAG 
     190        select FWRT_PACKAGE_KMOD_BROADCOM_DIAG 
    191191        select FWRT_PACKAGE_KMOD_SWITCH_ROBO 
    192192        select FWRT_PACKAGE_KMOD_WLCOMPAT 
    …… 
    202202        select FWRT_mipsel 
    203203        select FWRT_LINUX_2_4_BRCM 
    204         select FWRT_PACKAGE_KMOD_DIAG 
     204        select FWRT_PACKAGE_KMOD_BROADCOM_DIAG 
    205205        select FWRT_PACKAGE_KMOD_MADWIFI 
    206206        select FWRT_PACKAGE_KMOD_SWITCH_ROBO