diff options
author | Hauke Mehrtens <hauke@openwrt.org> | 2010-05-16 11:05:29 +0000 |
---|---|---|
committer | Hauke Mehrtens <hauke@openwrt.org> | 2010-05-16 11:05:29 +0000 |
commit | c3e3544ee088160e3b1014ba2bd03c9b85395e87 (patch) | |
tree | 62c8426f81aac2ec0db84412e207cb242f9127b2 | |
parent | 49554ca96f07becf9cd5a68ed8e637e280b13b1f (diff) | |
download | upstream-c3e3544ee088160e3b1014ba2bd03c9b85395e87.tar.gz upstream-c3e3544ee088160e3b1014ba2bd03c9b85395e87.tar.bz2 upstream-c3e3544ee088160e3b1014ba2bd03c9b85395e87.zip |
mac80211: update b43-fwcutter
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@21468 3c298f89-4303-0410-b956-a3cf2f4a3e73
-rw-r--r-- | package/mac80211/Makefile | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/package/mac80211/Makefile b/package/mac80211/Makefile index b5d8e97cfb..85fdc9b0c0 100644 --- a/package/mac80211/Makefile +++ b/package/mac80211/Makefile @@ -550,7 +550,7 @@ endef ifneq ($(CONFIG_B43_EXPERIMENTAL),) PKG_B43_FWV4_NAME:=broadcom-wl PKG_B43_FWV4_VERSION:=4.178.10.4 - PKG_B43_FWV4_OBJECT:=$(PKG_B43_FWV4_NAME)-$(PKG_B43_FWV4_VERSION)/linux/wl.o + PKG_B43_FWV4_OBJECT:=$(PKG_B43_FWV4_NAME)-$(PKG_B43_FWV4_VERSION)/linux/wl_apsta.o PKG_B43_FWV4_SOURCE:=$(PKG_B43_FWV4_NAME)-$(PKG_B43_FWV4_VERSION).tar.bz2 PKG_B43_FWV4_SOURCE_URL:=http://mirror2.openwrt.org/sources/ PKG_B43_FWV4_MD5SUM:=14477e8cbbb91b11896affac9b219fdb @@ -578,7 +578,7 @@ PKG_B43_FWV3_SOURCE:=$(PKG_B43_FWV3_NAME)-$(PKG_B43_FWV3_VERSION).o PKG_B43_FWV3_SOURCE_URL:=http://downloads.openwrt.org/sources/ PKG_B43_FWV3_MD5SUM:=e08665c5c5b66beb9c3b2dd54aa80cb3 -ifneq ($(CONFIG_B43_OPENFIRMWARE),) +ifeq ($(CONFIG_B43_OPENFIRMWARE),y) PKG_B43_FWCUTTER_NAME:=b43-fwcutter PKG_B43_FWCUTTER_VERSION:=3e69531aa65b8f664a0ab00dfc3e2eefeb0cb417 PKG_B43_FWCUTTER_SOURCE:=$(PKG_B43_FWCUTTER_NAME)-$(PKG_B43_FWCUTTER_VERSION).tar.bz2 @@ -588,11 +588,11 @@ ifneq ($(CONFIG_B43_OPENFIRMWARE),) PKG_B43_FWCUTTER_OBJECT:=$(PKG_B43_FWCUTTER_NAME)-$(PKG_B43_FWCUTTER_VERSION)/fwcutter/ else PKG_B43_FWCUTTER_NAME:=b43-fwcutter - PKG_B43_FWCUTTER_VERSION:=012 + PKG_B43_FWCUTTER_VERSION:=013 PKG_B43_FWCUTTER_SOURCE:=$(PKG_B43_FWCUTTER_NAME)-$(PKG_B43_FWCUTTER_VERSION).tar.bz2 PKG_B43_FWCUTTER_PROTO:=default PKG_B43_FWCUTTER_SOURCE_URL:=http://bu3sch.de/b43/fwcutter/ - PKG_B43_FWCUTTER_MD5SUM:=69eadf67b459f313a8d6b37aaabef96c + PKG_B43_FWCUTTER_MD5SUM:=3547ec6c474ac1bc2c4a5bb765b791a4 PKG_B43_FWCUTTER_SUBDIR:=b43-fwcutter-$(PKG_B43_FWCUTTER_VERSION) PKG_B43_FWCUTTER_OBJECT:=$(PKG_B43_FWCUTTER_NAME)-$(PKG_B43_FWCUTTER_VERSION)/ endif @@ -989,7 +989,7 @@ define Build/b43-common $(MAKE) -C "$(PKG_BUILD_DIR)/$(PKG_B43_FWCUTTER_OBJECT)" \ CFLAGS="-I$(STAGING_DIR_HOST)/include -include endian.h" $(INSTALL_BIN) $(PKG_BUILD_DIR)/$(PKG_B43_FWCUTTER_OBJECT)/b43-fwcutter $(STAGING_DIR_HOST)/bin/ -ifneq ($(CONFIG_B43_OPENFIRMWARE),) +ifeq ($(CONFIG_B43_OPENFIRMWARE),y) $(INSTALL_DIR) $(STAGING_DIR_HOST)/bin/ $(MAKE) -C "$(PKG_BUILD_DIR)/$(PKG_B43_FWCUTTER_SUBDIR)/assembler/" $(INSTALL_BIN) $(PKG_BUILD_DIR)/$(PKG_B43_FWCUTTER_SUBDIR)/assembler/b43-asm $(STAGING_DIR_HOST)/bin/ @@ -1001,20 +1001,20 @@ endef define KernelPackage/b43/install rm -rf $(1)/lib/firmware/ $(call Build/b43-common) -ifneq ($(CONFIG_B43_OPENFIRMWARE),) +ifeq ($(CONFIG_B43_OPENFIRMWARE),y) tar xzf "$(DL_DIR)/$(PKG_B43_FWV4_SOURCE)" -C "$(PKG_BUILD_DIR)" else tar xjf "$(DL_DIR)/$(PKG_B43_FWV4_SOURCE)" -C "$(PKG_BUILD_DIR)" endif $(INSTALL_DIR) $(1)/lib/firmware/ -ifneq ($(CONFIG_B43_OPENFIRMWARE),) +ifeq ($(CONFIG_B43_OPENFIRMWARE),y) $(MAKE) -C "$(PKG_BUILD_DIR)/$(PKG_B43_FWV4_OBJECT)/" $(INSTALL_DIR) $(1)/lib/firmware/b43-open/ $(INSTALL_DATA) $(PKG_BUILD_DIR)/$(PKG_B43_FWV4_OBJECT)/ucode5.fw $(1)/lib/firmware/b43-open/ucode5.fw $(INSTALL_DATA) $(PKG_BUILD_DIR)/$(PKG_B43_FWV4_OBJECT)/b0g0bsinitvals5.fw $(1)/lib/firmware/b43-open/b0g0bsinitvals5.fw $(INSTALL_DATA) $(PKG_BUILD_DIR)/$(PKG_B43_FWV4_OBJECT)/b0g0initvals5.fw $(1)/lib/firmware/b43-open/b0g0initvals5.fw else - b43-fwcutter --unsupported -w $(1)/lib/firmware/ $(PKG_BUILD_DIR)/$(PKG_B43_FWV4_OBJECT) + b43-fwcutter -w $(1)/lib/firmware/ $(PKG_BUILD_DIR)/$(PKG_B43_FWV4_OBJECT) endif ifneq ($(CONFIG_B43_FW_SQUASH),) b43-fwsquash.py "$(CONFIG_B43_FW_SQUASH_PHYTYPES)" "$(CONFIG_B43_FW_SQUASH_COREREVS)" "$(1)/lib/firmware/b43" |