Changeset 33669


Ignore:
Timestamp:
2012-10-08T22:18:27+02:00 (5 years ago)
Author:
hauke
Message:

mac80211: brcmsmac: use firmware extracted from proprietary driver

The firmware from linux-firmware does not support the rev 17 core found
in a bcm4716. The firmware extracted from the proprietary driver
supports this core. Use this firmware instead by default.

Location:
trunk
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • trunk/package/mac80211/Makefile

    r33668 r33669  
    10801080endef 
    10811081 
     1082PKG_BRCMSMAC_FW_NAME:=broadcom-wl 
     1083PKG_BRCMSMAC_FW_VERSION:=5.100.138 
     1084PKG_BRCMSMAC_FW_OBJECT:=$(PKG_BRCMSMAC_FW_NAME)-$(PKG_BRCMSMAC_FW_VERSION)/linux/wl_apsta.o 
     1085PKG_BRCMSMAC_FW_SOURCE:=$(PKG_BRCMSMAC_FW_NAME)-$(PKG_BRCMSMAC_FW_VERSION).tar.bz2 
     1086PKG_BRCMSMAC_FW_SOURCE_URL:=http://www.lwfinger.com/b43-firmware/ 
     1087PKG_BRCMSMAC_FW_MD5SUM:=f4e357b09eaf5d8b1f1920cf3493a555 
     1088 
    10821089define KernelPackage/brcmsmac 
    10831090  $(call KernelPackage/mac80211/Default) 
     
    10871094  FILES:=$(PKG_BUILD_DIR)/drivers/net/wireless/brcm80211/brcmsmac/brcmsmac.ko 
    10881095  AUTOLOAD:=$(call AutoLoad,31,brcmsmac) 
     1096  MENU:=1 
    10891097endef 
    10901098 
     
    10921100 Kernel module for Broadcom IEEE802.11n PCIe Wireless cards 
    10931101endef 
     1102 
     1103define KernelPackage/brcmsmac/config 
     1104        menu "Configuration" 
     1105                depends on PACKAGE_kmod-brcmsmac 
     1106 
     1107        config BRCMSMAC_USE_FW_FROM_WL 
     1108                bool "Use firmware extracted from broadcom proprietary driver" 
     1109                default y 
     1110                help 
     1111                  Instead of using the official brcmsmac firmware a firmware 
     1112                  version 666.2 extracted from the proprietary Broadcom driver 
     1113                  is used. This is needed to get core rev 17 used in bcm4716 
     1114                  to work. 
     1115 
     1116                  If unsure, say Y. 
     1117 
     1118        endmenu 
     1119endef 
     1120 
    10941121 
    10951122define KernelPackage/brcmfmac 
     
    15221549define KernelPackage/brcmsmac/install 
    15231550        $(INSTALL_DIR) $(1)/lib/firmware/brcm 
     1551ifeq ($(CONFIG_BRCMSMAC_USE_FW_FROM_WL),y) 
     1552        tar xjf "$(DL_DIR)/$(PKG_BRCMSMAC_FW_SOURCE)" -C "$(PKG_BUILD_DIR)" 
     1553        b43-fwcutter --brcmsmac -w $(1)/lib/firmware/ $(PKG_BUILD_DIR)/$(PKG_BRCMSMAC_FW_OBJECT) 
     1554else 
    15241555        $(INSTALL_DATA) \ 
    15251556                $(PKG_BUILD_DIR)/$(PKG_LINUX_FIRMWARE_SUBDIR)/brcm/bcm43xx-0.fw \ 
    15261557                $(PKG_BUILD_DIR)/$(PKG_LINUX_FIRMWARE_SUBDIR)/brcm/bcm43xx_hdr-0.fw \ 
    15271558                $(1)/lib/firmware/brcm/ 
     1559endif 
    15281560endef 
    15291561 
  • trunk/package/mac80211/patches/849-brcmsmac-add-device-found-on-some-SoCs-like-the-bcm4.patch

    r33583 r33669  
    55 /* recognized BCMA Core IDs */ 
    66 static struct bcma_device_id brcms_coreid_table[] = { 
    7 +//     BCMA_CORE(BCMA_MANUF_BCM, BCMA_CORE_80211, 17, BCMA_ANY_CLASS), 
     7+       BCMA_CORE(BCMA_MANUF_BCM, BCMA_CORE_80211, 17, BCMA_ANY_CLASS), 
    88        BCMA_CORE(BCMA_MANUF_BCM, BCMA_CORE_80211, 23, BCMA_ANY_CLASS), 
    99        BCMA_CORE(BCMA_MANUF_BCM, BCMA_CORE_80211, 24, BCMA_ANY_CLASS), 
  • trunk/tools/Makefile

    r33668 r33669  
    2626endif 
    2727tools-y += lzma squashfs4 
    28 ifneq ($(CONFIG_PACKAGE_kmod-b43)$(CONFIG_PACKAGE_kmod-b43legacy),) 
     28ifneq ($(CONFIG_PACKAGE_kmod-b43)$(CONFIG_PACKAGE_kmod-b43legacy)$(CONFIG_BRCMSMAC_USE_FW_FROM_WL),) 
    2929tools-y += b43-tools 
    3030endif 
Note: See TracChangeset for help on using the changeset viewer.