diff options
author | Hauke Mehrtens <hauke@hauke-m.de> | 2012-10-08 20:15:42 +0000 |
---|---|---|
committer | Hauke Mehrtens <hauke@hauke-m.de> | 2012-10-08 20:15:42 +0000 |
commit | d14c6b29eb4e2b23cf2d90b15cc8774a72a06d31 (patch) | |
tree | 865fc921b75f7e1f5a91d7caecf62b8bdc80a91d /tools | |
parent | 5322ca7a30c697fb8f376cb83f0d431ac8d51075 (diff) | |
download | openwrt-d14c6b29eb4e2b23cf2d90b15cc8774a72a06d31.tar.gz openwrt-d14c6b29eb4e2b23cf2d90b15cc8774a72a06d31.tar.bz2 openwrt-d14c6b29eb4e2b23cf2d90b15cc8774a72a06d31.zip |
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.
SVN-Revision: 33668
Diffstat (limited to 'tools')
-rw-r--r-- | tools/Makefile | 4 | ||||
-rw-r--r-- | tools/b43-tools/Makefile | 50 | ||||
-rwxr-xr-x | tools/b43-tools/files/b43-fwsquash.py | 122 | ||||
-rw-r--r-- | tools/b43-tools/patches/001-fw-dirname.patch | 16 |
4 files changed, 192 insertions, 0 deletions
diff --git a/tools/Makefile b/tools/Makefile index 842926ae7d..620da05f00 100644 --- a/tools/Makefile +++ b/tools/Makefile @@ -25,6 +25,9 @@ ifneq ($(CONFIG_TARGET_ar71xx),) tools-y += lzma-old squashfs endif tools-y += lzma squashfs4 +ifneq ($(CONFIG_PACKAGE_kmod-b43)$(CONFIG_PACKAGE_kmod-b43legacy),) +tools-y += b43-tools +endif ifneq ($(CONFIG_PACKAGE_firmwarehotplug),) tools-y += sdcc @@ -64,6 +67,7 @@ $(curdir)/missing-macros/compile := $(curdir)/automake/install $(curdir)/e2fsprogs/compile := $(curdir)/automake/install $(curdir)/libelf/compile := $(curdir)/automake/install $(curdir)/sdcc/compile := $(curdir)/bison/install +$(curdir)/b43-tools/compile := $(curdir)/bison/install ifneq ($(CONFIG_CCACHE),) $(foreach tool, $(tools-y), $(eval $(curdir)/$(tool)/compile += $(curdir)/ccache/install)) diff --git a/tools/b43-tools/Makefile b/tools/b43-tools/Makefile new file mode 100644 index 0000000000..576a580dfc --- /dev/null +++ b/tools/b43-tools/Makefile @@ -0,0 +1,50 @@ +# +# Copyright (C) 2012 OpenWrt.org +# +# This is free software, licensed under the GNU General Public License v2. +# See /LICENSE for more information. +# + +include $(TOPDIR)/rules.mk + +PKG_NAME:=b43-tools +PKG_VERSION:=016 + +PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 +PKG_SOURCE_URL:=git://git.bues.ch/b43-tools.git +PKG_SOURCE_PROTO:=git +PKG_SOURCE_SUBDIR:=$(PKG_NAME) +PKG_SOURCE_VERSION:=38267954aae73659de271c67e6892c744b47f3d8 +PKG_MIRROR_MD5SUM:=7826262ac6870ac27c22a1b6974f8952 +HOST_BUILD_DIR=$(BUILD_DIR_HOST)/$(PKG_NAME) + +include $(INCLUDE_DIR)/host-build.mk + + +define Host/Compile + +$(MAKE) $(HOST_JOBS) -C $(HOST_BUILD_DIR)/fwcutter \ + CFLAGS="$(HOST_CFLAGS) -include endian.h" \ + $(HOST_MAKE_FLAGS) \ + $(1) QUIET_SPARSE=: + +$(MAKE) $(HOST_JOBS) -C $(HOST_BUILD_DIR)/assembler \ + CFLAGS="$(HOST_CFLAGS) -include endian.h" \ + $(HOST_MAKE_FLAGS) \ + $(1) QUIET_SPARSE=: +endef + +define Host/Install + $(INSTALL_DIR) $(STAGING_DIR_HOST)/bin + $(INSTALL_BIN) $(HOST_BUILD_DIR)/fwcutter/b43-fwcutter $(STAGING_DIR_HOST)/bin/ + $(INSTALL_BIN) $(HOST_BUILD_DIR)/assembler/b43-asm $(STAGING_DIR_HOST)/bin/ + $(INSTALL_BIN) $(HOST_BUILD_DIR)/assembler/b43-asm.bin $(STAGING_DIR_HOST)/bin/ + $(INSTALL_BIN) ./files/b43-fwsquash.py $(STAGING_DIR_HOST)/bin/ +endef + +define Host/Clean + rm -f $(STAGING_DIR_HOST)/bin/b43-fwcutter + rm -f $(STAGING_DIR_HOST)/bin/b43-asm + rm -f $(STAGING_DIR_HOST)/bin/b43-asm.bin + rm -f $(STAGING_DIR_HOST)/bin/b43-fwsquash.py +endef + +$(eval $(call HostBuild)) diff --git a/tools/b43-tools/files/b43-fwsquash.py b/tools/b43-tools/files/b43-fwsquash.py new file mode 100755 index 0000000000..cd8818167e --- /dev/null +++ b/tools/b43-tools/files/b43-fwsquash.py @@ -0,0 +1,122 @@ +#!/usr/bin/env python +# +# b43 firmware file squasher +# Removes unnecessary firmware files +# +# Copyright (c) 2009 Michael Buesch <mb@bu3sch.de> +# +# 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) + diff --git a/tools/b43-tools/patches/001-fw-dirname.patch b/tools/b43-tools/patches/001-fw-dirname.patch new file mode 100644 index 0000000000..e9bd03249f --- /dev/null +++ b/tools/b43-tools/patches/001-fw-dirname.patch @@ -0,0 +1,16 @@ +--- a/fwcutter/fwcutter.c ++++ b/fwcutter/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; + |