diff options
| author | Roman Yeryomin <roman@advem.lv> | 2013-05-26 01:02:55 +0300 |
|---|---|---|
| committer | Roman Yeryomin <roman@advem.lv> | 2013-05-26 01:02:55 +0300 |
| commit | 342045a35b1981a89e4bc80842b10c065e1050da (patch) | |
| tree | 4140720b20e8d641c11da882010d6130a75fef21 /tools/b43-tools | |
| parent | 7338133dde8238afce34676214b494c8db96689b (diff) | |
| parent | 1a116ce7818ecee5d167a9c0ebb1a0feca9120e6 (diff) | |
Merge trunk into realtek-unstable
Conflicts:
Config.in
feeds.conf.default
package/base-files/files/etc/hotplug2-common.rules
package/network/config/netifd/files/etc/init.d/network
Diffstat (limited to 'tools/b43-tools')
| -rw-r--r-- | tools/b43-tools/Makefile | 6 | ||||
| -rw-r--r-- | tools/b43-tools/patches/003-brcmsmac-lcn-ucode.patch | 22 | ||||
| -rw-r--r-- | tools/b43-tools/patches/100-b43-asm-fix-compile-error-undefined-reference-to-yyd.patch | 27 |
3 files changed, 30 insertions, 25 deletions
diff --git a/tools/b43-tools/Makefile b/tools/b43-tools/Makefile index d58a20e6a..e25bfc23c 100644 --- a/tools/b43-tools/Makefile +++ b/tools/b43-tools/Makefile @@ -8,14 +8,14 @@ include $(TOPDIR)/rules.mk PKG_NAME:=b43-tools -PKG_VERSION:=016 +PKG_VERSION:=017 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:=50ca3c763ee21ee213addd17cf1c1b86 +PKG_SOURCE_VERSION:=691cd291afdb3dbfcf6b9624f8f4bd068af153d0 +#PKG_MIRROR_MD5SUM:=50ca3c763ee21ee213addd17cf1c1b86 HOST_BUILD_DIR=$(BUILD_DIR_HOST)/$(PKG_NAME) include $(INCLUDE_DIR)/host-build.mk diff --git a/tools/b43-tools/patches/003-brcmsmac-lcn-ucode.patch b/tools/b43-tools/patches/003-brcmsmac-lcn-ucode.patch deleted file mode 100644 index 12966a558..000000000 --- a/tools/b43-tools/patches/003-brcmsmac-lcn-ucode.patch +++ /dev/null @@ -1,22 +0,0 @@ -diff --git a/fwcutter/fwcutter.c b/fwcutter/fwcutter.c -index 6f5788c..e9082f9 100644 ---- a/fwcutter/fwcutter.c -+++ b/fwcutter/fwcutter.c -@@ -449,7 +449,7 @@ static int brcmsmac_name_to_idx(const char *name) - return D11N0INITVALS16; - } else if (strcmp("ucode16_mimo", name) == 0) { - return D11UCODE_OVERSIGHT16_MIMO; -- } else if (strcmp("ucode24_mimo", name) == 0) { -+ } else if (strcmp("ucode24_lcn", name) == 0) { - return D11UCODE_OVERSIGHT24_LCN; - } - return 0; -@@ -459,7 +459,7 @@ static int brcmsmac_name_to_size_idx(const char *name) - { - if (strcmp("ucode16_mimo", name) == 0) { - return D11UCODE_OVERSIGHT16_MIMOSZ; -- } else if (strcmp("ucode24_mimo", name) == 0) { -+ } else if (strcmp("ucode24_lcn", name) == 0) { - return D11UCODE_OVERSIGHT24_LCNSZ; - } - return 0; diff --git a/tools/b43-tools/patches/100-b43-asm-fix-compile-error-undefined-reference-to-yyd.patch b/tools/b43-tools/patches/100-b43-asm-fix-compile-error-undefined-reference-to-yyd.patch new file mode 100644 index 000000000..fc0553d6b --- /dev/null +++ b/tools/b43-tools/patches/100-b43-asm-fix-compile-error-undefined-reference-to-yyd.patch @@ -0,0 +1,27 @@ +--- a/assembler/Makefile ++++ b/assembler/Makefile +@@ -30,7 +30,7 @@ BIN = b43-asm.bin + SRCS = parser.c scanner.c main.c initvals.c util.c args.c + + # YACC related CFLAGS +-CFLAGS += -DYYSTYPE="void *" -DYYERROR_VERBOSE -DYYDEBUG -DYYENABLE_NLS=0 -DYYLTYPE_IS_TRIVIAL=0 -Wno-unused ++CFLAGS += -DYYSTYPE="void *" -DYYERROR_VERBOSE -DYYDEBUG=1 -DYYENABLE_NLS=0 -DYYLTYPE_IS_TRIVIAL=0 -Wno-unused + + .SUFFIXES: + .PHONY: all install clean distclean +diff --git a/assembler/main.c b/assembler/main.c +index afca996..a62a15e 100644 +--- a/assembler/main.c ++++ b/assembler/main.c +@@ -1260,7 +1260,7 @@ static void initialize(void) + { + INIT_LIST_HEAD(&infile.sl); + INIT_LIST_HEAD(&infile.ivals); +-#ifdef YYDEBUG ++#if YYDEBUG + if (IS_INSANE_DEBUG) + yydebug = 1; + else +-- +1.7.10.4 + |