From c236f54c00d37635cd432be677678148e5eb41e6 Mon Sep 17 00:00:00 2001
From: hauke <hauke@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Date: Fri, 7 Dec 2012 18:30:19 +0000
Subject: b43-tools: update to version 017, which contains the patch.

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@34574 3c298f89-4303-0410-b956-a3cf2f4a3e73
---
 tools/b43-tools/Makefile                           |  6 +++---
 .../b43-tools/patches/003-brcmsmac-lcn-ucode.patch | 22 ----------------------
 2 files changed, 3 insertions(+), 25 deletions(-)
 delete mode 100644 tools/b43-tools/patches/003-brcmsmac-lcn-ucode.patch

(limited to 'tools/b43-tools')

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;
-- 
cgit v1.2.3


From 45f81256853c8a12cc4daf8b1f68379afb288cd1 Mon Sep 17 00:00:00 2001
From: hauke <hauke@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Date: Thu, 28 Feb 2013 10:43:02 +0000
Subject: b43-tools: fix compile error: undefined reference to `yydebug'

With bison 2.7 YYDEBUG will be set to 0 if it was not set, then #ifdef
YYDEBUG returns true, but bison 2.7 treets YYDEBUG 0 as not set.

This fixes the following error:
obj/main.o: In function `main':
main.c:(.text.startup+0xaf): undefined reference to `yydebug'
collect2: error: ld returned 1 exit status

This closes #13093.


git-svn-id: svn://svn.openwrt.org/openwrt/trunk@35830 3c298f89-4303-0410-b956-a3cf2f4a3e73
---
 ...-compile-error-undefined-reference-to-yyd.patch | 27 ++++++++++++++++++++++
 1 file changed, 27 insertions(+)
 create mode 100644 tools/b43-tools/patches/100-b43-asm-fix-compile-error-undefined-reference-to-yyd.patch

(limited to 'tools/b43-tools')

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
+
-- 
cgit v1.2.3