fixes variables, oops

[openwrt.git] / package / b43 / Makefile

diff --git a/package/b43/Makefile b/package/b43/Makefile
index c4cc91f..28a6cc5 100644 (file)
--- a/package/b43/Makefile
+++ b/package/b43/Makefile
@@ -15,19 +15,26 @@ 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
+
+PKG_SRC_NAME:=b43-src
+PKG_SRC_VERSION:=2008-08-06
+
+PKG_SRC_SOURCE:=compat-wireless-$(PKG_SRC_VERSION).tar.bz2
+PKG_SRC_SOURCE_URL:=http://www.orbit-lab.org/kernel/compat-wireless-2.6/2008/08/
+PKG_SRC_MD5SUM:=9563ceeed86bca0859ad5f010623277c

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


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

-       CONFIG_B43_DMA=y \
+       CONFIG_B43_NPHY=y \
+       CONFIG_B43_DEBUG=y \
+       $(if $(CONFIG_RFKILL),CONFIG_B43_RFKILL=y) \

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


@@ -70,9 +79,12 @@ $(DL_DIR)/$(PKG_FWCUTTER_SOURCE):
 
 define Build/Prepare
        mkdir -p $(PKG_BUILD_DIR)
 
 define Build/Prepare
        mkdir -p $(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)"
        tar xjf "$(DL_DIR)/$(PKG_FWV4_SOURCE)" -C "$(PKG_BUILD_DIR)"
        tar xjf "$(DL_DIR)/$(PKG_FWCUTTER_SOURCE)" -C "$(PKG_BUILD_DIR)"

+       tar xjf "$(DL_DIR)/$(PKG_SRC_SOURCE)" -C "$(PKG_BUILD_DIR)"
+       $(CP) $(PKG_BUILD_DIR)/compat-wireless-$(PKG_SRC_VERSION)/drivers/net/wireless/b43/* $(PKG_BUILD_DIR)/
+       $(Build/Patch)
+       $(if $(QUILT),touch $(PKG_BUILD_DIR)/.quilt_used)

 endef
 
 define Build/Configure
 endef
 
 define Build/Configure