From 6c0ffe4c6e007cc8dd3e8f0d527f90b82d685511 Mon Sep 17 00:00:00 2001 From: hauke Date: Mon, 8 Oct 2012 20:15:42 +0000 Subject: tools: add b43-tools Move the b43-tools build from the mac80211 Makefile into an own package in tools and use the newest version of b43-tools. git-svn-id: svn://svn.openwrt.org/openwrt/trunk@33668 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- .../mac80211/files/b43-fwcutter-fw-dirname.patch | 16 --- package/mac80211/files/host_bin/b43-fwsquash.py | 122 --------------------- 2 files changed, 138 deletions(-) delete mode 100644 package/mac80211/files/b43-fwcutter-fw-dirname.patch delete mode 100755 package/mac80211/files/host_bin/b43-fwsquash.py (limited to 'package/mac80211/files') diff --git a/package/mac80211/files/b43-fwcutter-fw-dirname.patch b/package/mac80211/files/b43-fwcutter-fw-dirname.patch deleted file mode 100644 index c2f49ab78..000000000 --- a/package/mac80211/files/b43-fwcutter-fw-dirname.patch +++ /dev/null @@ -1,16 +0,0 @@ ---- a/fwcutter.c -+++ b/fwcutter.c -@@ -48,13 +48,8 @@ - #include "fwcutter.h" - #include "fwcutter_list.h" - --#if defined(__DragonFly__) || defined(__FreeBSD__) --#define V3_FW_DIRNAME "v3" --#define V4_FW_DIRNAME "v4" --#else - #define V3_FW_DIRNAME "b43legacy" - #define V4_FW_DIRNAME "b43" --#endif - - static struct cmdline_args cmdargs; - diff --git a/package/mac80211/files/host_bin/b43-fwsquash.py b/package/mac80211/files/host_bin/b43-fwsquash.py deleted file mode 100755 index cd8818167..000000000 --- a/package/mac80211/files/host_bin/b43-fwsquash.py +++ /dev/null @@ -1,122 +0,0 @@ -#!/usr/bin/env python -# -# b43 firmware file squasher -# Removes unnecessary firmware files -# -# Copyright (c) 2009 Michael Buesch -# -# Licensed under the GNU/GPL version 2 or (at your option) any later version. -# - -import sys -import os - -def usage(): - print("Usage: %s PHYTYPES COREREVS /path/to/extracted/firmware" % sys.argv[0]) - print("") - print("PHYTYPES is a comma separated list of:") - print("A => A-PHY") - print("AG => Dual A-PHY G-PHY") - print("G => G-PHY") - print("LP => LP-PHY") - print("N => N-PHY") - print("HT => HT-PHY") - print("LCN => LCN-PHY") - print("") - print("COREREVS is a comma separated list of core revision numbers.") - -if len(sys.argv) != 4: - usage() - sys.exit(1) - -phytypes = sys.argv[1] -corerevs = sys.argv[2] -fwpath = sys.argv[3] - -phytypes = phytypes.split(',') -try: - corerevs = map(lambda r: int(r), corerevs.split(',')) -except ValueError: - print("ERROR: \"%s\" is not a valid COREREVS string\n" % corerevs) - usage() - sys.exit(1) - - -fwfiles = os.listdir(fwpath) -fwfiles = filter(lambda str: str.endswith(".fw"), fwfiles) -if not fwfiles: - print("ERROR: No firmware files found in %s" % fwpath) - sys.exit(1) - -required_fwfiles = [] - -def revs_match(revs_a, revs_b): - for rev in revs_a: - if rev in revs_b: - return True - return False - -def phytypes_match(types_a, types_b): - for type in types_a: - type = type.strip().upper() - if type in types_b: - return True - return False - -revmapping = { - "ucode2.fw" : (2,3,), - "ucode4.fw" : (4,), - "ucode5.fw" : (5,6,7,8,9,10,), - "ucode11.fw" : (11,12,), - "ucode13.fw" : (13,), - "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,), -} - -initvalmapping = { - "a0g1initvals5.fw" : ( (5,6,7,8,9,10,), ("AG",), ), - "a0g0initvals5.fw" : ( (5,6,7,8,9,10,), ("A", "AG",), ), - "b0g0initvals2.fw" : ( (2,4,), ("G",), ), - "b0g0initvals5.fw" : ( (5,6,7,8,9,10,), ("G",), ), - "b0g0initvals13.fw" : ( (13,), ("G",), ), - "n0initvals11.fw" : ( (11,12,), ("N",), ), - "n0initvals16.fw" : ( (16,), ("N",), ), - "lp0initvals13.fw" : ( (13,), ("LP",), ), - "lp0initvals14.fw" : ( (14,), ("LP",), ), - "lp0initvals15.fw" : ( (15,), ("LP",), ), - "lcn0initvals24.fw" : ( (24,), ("LCN",), ), - "ht0initvals29.fw" : ( (29,), ("HT",), ), - "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",), ), - "n0bsinitvals16.fw" : ( (16,), ("N",), ), - "lp0bsinitvals13.fw" : ( (13,), ("LP",), ), - "lp0bsinitvals14.fw" : ( (14,), ("LP",), ), - "lp0bsinitvals15.fw" : ( (15,), ("LP",), ), - "lcn0bsinitvals24.fw" : ( (24,), ("LCN",), ), - "ht0bsinitvals29.fw" : ( (29,), ("HT",), ), -} - -for f in fwfiles: - if f in revmapping: - if revs_match(corerevs, revmapping[f]): - required_fwfiles += [f] - continue - if f in initvalmapping: - if revs_match(corerevs, initvalmapping[f][0]) and\ - phytypes_match(phytypes, initvalmapping[f][1]): - required_fwfiles += [f] - continue - print("WARNING: Firmware file %s not found in the mapping lists" % f) - -for f in fwfiles: - if f not in required_fwfiles: - print("Deleting %s" % f) - os.unlink(fwpath + '/' + f) - -- cgit v1.2.3