mac80211: add support for firmware 666.2 for b43 devices

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@29485 3c298f89-4303-0410-b956-a3cf2f4a3e73
master
Hauke Mehrtens 2011-12-08 22:53:13 +00:00
parent ffa53698c0
commit 55cf8524dc
2 changed files with 27 additions and 6 deletions

View File

@ -766,6 +766,14 @@ ifneq ($(CONFIG_B43_FW_4_178),)
PKG_B43_FWV4_SOURCE:=$(PKG_B43_FWV4_NAME)-$(PKG_B43_FWV4_VERSION).tar.bz2
PKG_B43_FWV4_SOURCE_URL:=http://mirror2.openwrt.org/sources/
PKG_B43_FWV4_MD5SUM:=14477e8cbbb91b11896affac9b219fdb
else
ifneq ($(CONFIG_B43_FW_5_100_138),)
PKG_B43_FWV4_NAME:=broadcom-wl
PKG_B43_FWV4_VERSION:=5.100.138
PKG_B43_FWV4_OBJECT:=$(PKG_B43_FWV4_NAME)-$(PKG_B43_FWV4_VERSION)/linux/wl_apsta.o
PKG_B43_FWV4_SOURCE:=$(PKG_B43_FWV4_NAME)-$(PKG_B43_FWV4_VERSION).tar.bz2
PKG_B43_FWV4_SOURCE_URL:=http://www.lwfinger.com/b43-firmware/
PKG_B43_FWV4_MD5SUM:=f4e357b09eaf5d8b1f1920cf3493a555
else
PKG_B43_FWV4_NAME:=broadcom-wl
PKG_B43_FWV4_VERSION:=4.150.10.5
@ -775,6 +783,7 @@ else
PKG_B43_FWV4_MD5SUM:=0c6ba9687114c6b598e8019e262d9a60
endif
endif
endif
ifneq ($(CONFIG_B43_OPENFIRMWARE),)
PKG_B43_FWV4_NAME:=broadcom-wl
PKG_B43_FWV4_VERSION:=5.2
@ -801,11 +810,11 @@ ifeq ($(CONFIG_B43_OPENFIRMWARE),y)
PKG_B43_FWCUTTER_OBJECT:=$(PKG_B43_FWCUTTER_NAME)-$(PKG_B43_FWCUTTER_VERSION)/fwcutter/
else
PKG_B43_FWCUTTER_NAME:=b43-fwcutter
PKG_B43_FWCUTTER_VERSION:=014
PKG_B43_FWCUTTER_VERSION:=015
PKG_B43_FWCUTTER_SOURCE:=$(PKG_B43_FWCUTTER_NAME)-$(PKG_B43_FWCUTTER_VERSION).tar.bz2
PKG_B43_FWCUTTER_PROTO:=default
PKG_B43_FWCUTTER_SOURCE_URL:=http://bu3sch.de/b43/fwcutter/
PKG_B43_FWCUTTER_MD5SUM:=dd63f9149510bd6e01b89314e955083b
PKG_B43_FWCUTTER_MD5SUM:=628e030565222a107bc40300313cbe76
PKG_B43_FWCUTTER_SUBDIR:=b43-fwcutter-$(PKG_B43_FWCUTTER_VERSION)
PKG_B43_FWCUTTER_OBJECT:=$(PKG_B43_FWCUTTER_NAME)-$(PKG_B43_FWCUTTER_VERSION)/
endif
@ -887,6 +896,15 @@ define KernelPackage/b43/config
If unsure, select the "stable" firmware.
config B43_FW_5_100_138
bool "Firmware 666.2 from driver 5.100.138"
help
Newer experimental firmware for BCM43xx devices.
This firmware is mostly untested. It is needed for some N-PHY devices.
If unsure, select the "stable" firmware.
config B43_OPENFIRMWARE
bool "Open FirmWare for WiFi networks"
help
@ -964,7 +982,7 @@ define KernelPackage/b43/config
config PACKAGE_B43_PHY_N
bool "Enable support for N-PHYs"
select B43_FW_5_10
select B43_FW_5_100_138
default y
help
Enable support for BCM4321 and BCM4322.
@ -975,8 +993,7 @@ define KernelPackage/b43/config
config PACKAGE_B43_PHY_HT
bool "Enable support for HT-PHYs"
depends on BROKEN
select B43_FW_5_10
select B43_FW_5_100_138
default n
help
Currently broken.
@ -986,7 +1003,7 @@ define KernelPackage/b43/config
config PACKAGE_B43_PHY_LCN
bool "Enable support for LCN-PHYs"
depends on BROKEN
select B43_FW_5_10
select B43_FW_5_100_138
default n
help
Currently broken.

View File

@ -70,6 +70,8 @@ revmapping = {
"ucode14.fw" : (14,),
"ucode15.fw" : (15,),
"ucode16_mimo.fw" : (16,),
"ucode24_mimo.fw" : (24,),
"ucode29_mimo.fw" : (29,),
"pcm4.fw" : (1,2,3,4,),
"pcm5.fw" : (5,6,7,8,9,10,),
}
@ -93,6 +95,8 @@ initvalmapping = {
"lp0bsinitvals13.fw" : ( (13,), ("LP",), ),
"lp0bsinitvals14.fw" : ( (14,), ("LP",), ),
"lp0bsinitvals15.fw" : ( (15,), ("LP",), ),
"lcn0initvals24.fw" : ( (24,), ("LNC",), ),
"ht0initvals29.fw" : ( (29,), ("HT",), ),
}
for f in fwfiles: