GPIODEV: Fix open-count race condition.

[openwrt.git] / package / b43 / Makefile

diff --git a/package/b43/Makefile b/package/b43/Makefile
index 756e83b..3d5eb26 100644 (file)
--- a/package/b43/Makefile
+++ b/package/b43/Makefile
@@ -15,19 +15,19 @@ PKG_RELEASE:=1
 include $(INCLUDE_DIR)/package.mk
 
 PKG_FWV4_NAME:=broadcom-wl
 include $(INCLUDE_DIR)/package.mk
 
 PKG_FWV4_NAME:=broadcom-wl

-PKG_FWV4_VERSION=4.80.53.0
-PKG_FWV4_OBJECT:=kmod/wl_apsta.o
+PKG_FWV4_VERSION=4.150.10.5
+PKG_FWV4_OBJECT:=driver/wl_apsta_mimo.o

 
 PKG_FWV4_SOURCE:=$(PKG_FWV4_NAME)-$(PKG_FWV4_VERSION).tar.bz2
 
 PKG_FWV4_SOURCE:=$(PKG_FWV4_NAME)-$(PKG_FWV4_VERSION).tar.bz2

-PKG_FWV4_SOURCE_URL:=http://downloads.openwrt.org/sources/
-PKG_FWV4_MD5SUM:=a7d8dde3ce474c361143b83e1d9890b1
+PKG_FWV4_SOURCE_URL:=http://mirror2.openwrt.org/sources/
+PKG_FWV4_MD5SUM:=0c6ba9687114c6b598e8019e262d9a60

 
 PKG_FWCUTTER_NAME:=b43-fwcutter
 
 PKG_FWCUTTER_NAME:=b43-fwcutter

-PKG_FWCUTTER_VERSION=008
+PKG_FWCUTTER_VERSION=011

 
 PKG_FWCUTTER_SOURCE:=$(PKG_FWCUTTER_NAME)-$(PKG_FWCUTTER_VERSION).tar.bz2
 
 PKG_FWCUTTER_SOURCE:=$(PKG_FWCUTTER_NAME)-$(PKG_FWCUTTER_VERSION).tar.bz2

-PKG_FWCUTTER_SOURCE_URL:=http://download.berlios.de/bcm43xx/
-PKG_FWCUTTER_MD5SUM:=3f7fbf4f8dcd296c6d1b0d42eab0f9ac
+PKG_FWCUTTER_SOURCE_URL:=http://bu3sch.de/b43/fwcutter/
+PKG_FWCUTTER_MD5SUM:=3db2f4de85a459451f5b391cf67a8d44

 
 define KernelPackage/b43
   SUBMENU:=Wireless Drivers
 
 define KernelPackage/b43
   SUBMENU:=Wireless Drivers


@@ -43,7 +43,7 @@ endef
 
 EXTRA_KCONFIG:= \
        CONFIG_B43=m \
 
 EXTRA_KCONFIG:= \
        CONFIG_B43=m \

-       CONFIG_B43_DMA=y \
+       CONFIG_B43_NPHY=y \

        $(if $(CONFIG_LEDS_TRIGGERS),CONFIG_B43_LEDS=y) \
 
 
        $(if $(CONFIG_LEDS_TRIGGERS),CONFIG_B43_LEDS=y) \
 
 


@@ -73,6 +73,8 @@ define Build/Prepare
        $(CP) ./src/* $(PKG_BUILD_DIR)/
        tar xjf "$(DL_DIR)/$(PKG_FWV4_SOURCE)" -C "$(PKG_BUILD_DIR)"
        tar xjf "$(DL_DIR)/$(PKG_FWCUTTER_SOURCE)" -C "$(PKG_BUILD_DIR)"
        $(CP) ./src/* $(PKG_BUILD_DIR)/
        tar xjf "$(DL_DIR)/$(PKG_FWV4_SOURCE)" -C "$(PKG_BUILD_DIR)"
        tar xjf "$(DL_DIR)/$(PKG_FWCUTTER_SOURCE)" -C "$(PKG_BUILD_DIR)"

+       $(Build/Patch)
+       $(if $(QUILT),touch $(PKG_BUILD_DIR)/.quilt_used)

 endef
 
 define Build/Configure
 endef
 
 define Build/Configure


@@ -83,7 +85,8 @@ define Build/Compile
                $(MAKE_OPTS) \
                modules
 
                $(MAKE_OPTS) \
                modules
 

-       $(MAKE) -C "$(PKG_BUILD_DIR)/$(PKG_FWCUTTER_NAME)-$(PKG_FWCUTTER_VERSION)"
+       $(MAKE) -C "$(PKG_BUILD_DIR)/$(PKG_FWCUTTER_NAME)-$(PKG_FWCUTTER_VERSION)" \
+               CFLAGS="-I$(STAGING_DIR_HOST)/include -include endian.h"

 endef
 
 define KernelPackage/b43/install
 endef
 
 define KernelPackage/b43/install