From f1e9fb687b8ec20e4be60fdb8ab19f0622f8677b Mon Sep 17 00:00:00 2001 From: Hauke Mehrtens Date: Sat, 26 Dec 2009 01:06:36 +0000 Subject: b43: Add L-PHY firemware files to squash script Use firmware 4.178.10.4 as default on. Select firmware for all supported phy types and version as default. Close ticket #5978 SVN-Revision: 18935 --- package/mac80211/Config.in.b43 | 7 ++++--- package/mac80211/files/host_bin/b43-fwsquash.py | 9 ++++++++- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/package/mac80211/Config.in.b43 b/package/mac80211/Config.in.b43 index f539931..04576a8 100644 --- a/package/mac80211/Config.in.b43 +++ b/package/mac80211/Config.in.b43 @@ -3,7 +3,7 @@ choice prompt "b43 firmware version" depends on PACKAGE_kmod-b43 - default B43_STABLE + default B43_EXPERIMENTAL help This option allows you to select the version of the b43 firmware. @@ -41,6 +41,7 @@ endchoice config B43_FW_SQUASH bool "Remove unnecessary firmware files" depends on PACKAGE_kmod-b43 && !B43_OPENFIRMWARE + default y help This options allows you to remove unnecessary b43 firmware files from the final rootfs image. This can reduce the rootfs size by @@ -54,7 +55,7 @@ config B43_FW_SQUASH config B43_FW_SQUASH_COREREVS string "Core revisions to include" depends on PACKAGE_kmod-b43 && B43_FW_SQUASH - default "5,6,7,8,9,10" + default "5,6,7,8,9,10,13,14,15" help This is a comma seperated list of core revision numbers. Example (keep files for rev5 only): @@ -65,7 +66,7 @@ config B43_FW_SQUASH_COREREVS config B43_FW_SQUASH_PHYTYPES string "PHY types to include" depends on PACKAGE_kmod-b43 && B43_FW_SQUASH - default "G,LP,N" + default "A,AG,G,LP" help This is a comma seperated list of PHY types: A => A-PHY diff --git a/package/mac80211/files/host_bin/b43-fwsquash.py b/package/mac80211/files/host_bin/b43-fwsquash.py index 52484d1..088ed48 100755 --- a/package/mac80211/files/host_bin/b43-fwsquash.py +++ b/package/mac80211/files/host_bin/b43-fwsquash.py @@ -65,7 +65,8 @@ revmapping = { "ucode5.fw" : (5,6,7,8,9,10,), "ucode11.fw" : (11,12,), "ucode13.fw" : (13,), - "pcm4.fw" : (1,2,3,4,), + "ucode14.fw" : (14,), + "ucode15.fw" : (15,), "pcm5.fw" : (5,6,7,8,9,10,), } @@ -75,10 +76,16 @@ initvalmapping = { "b0g0initvals5.fw" : ( (5,6,7,8,9,10,), ("G",), ), "b0g0initvals13.fw" : ( (13,), ("G",), ), "n0initvals11.fw" : ( (11,12,), ("N",), ), + "lp0initvals13.fw" : ( (13,), ("LP",), ), + "lp0initvals14.fw" : ( (14,), ("LP",), ), + "lp0initvals15.fw" : ( (15,), ("LP",), ), "a0g1bsinitvals5.fw" : ( (5,6,7,8,9,10,), ("AG",), ), "a0g0bsinitvals5.fw" : ( (5,6,7,8,9,10,), ("A", "AG"), ), "b0g0bsinitvals5.fw" : ( (5,6,7,8,9,10,), ("G",), ), "n0bsinitvals11.fw" : ( (11,12,), ("N",), ), + "lp0bsinitvals13.fw" : ( (13,), ("LP",), ), + "lp0bsinitvals14.fw" : ( (14,), ("LP",), ), + "lp0bsinitvals15.fw" : ( (15,), ("LP",), ), } for f in fwfiles: -- cgit v1.1