X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/876d93410e5d031a5817cfb91d2465a45ee8bc2e..e79902b14c3ce7f722dee848e360d812958743fb:/package/mac80211/Makefile diff --git a/package/mac80211/Makefile b/package/mac80211/Makefile index 0650253da..d3f9e83af 100644 --- a/package/mac80211/Makefile +++ b/package/mac80211/Makefile @@ -1,39 +1,50 @@ # -# Copyright (C) 2007-2008 OpenWrt.org +# Copyright (C) 2007-2009 OpenWrt.org # # This is free software, licensed under the GNU General Public License v2. # See /LICENSE for more information. # -# $Id: Makefile 7440 2007-06-02 02:22:01Z nbd $ include $(TOPDIR)/rules.mk include $(INCLUDE_DIR)/kernel.mk PKG_NAME:=mac80211 -PKG_RELEASE:=1 -ifneq ($(CONFIG_LINUX_2_6_27),) - PKG_VERSION:=2008-11-03 - PKG_SOURCE_URL:=http://www.orbit-lab.org/kernel/compat-wireless-2.6/2008/11 -else +ifneq ($(CONFIG_LINUX_2_6_21)$(CONFIG_LINUX_2_6_23)$(CONFIG_LINUX_2_6_24)$(CONFIG_LINUX_2_6_25)$(CONFIG_LINUX_2_6_26),) PKG_VERSION:=2008-08-06 + PKG_RELEASE:=2 PKG_SOURCE_URL:=http://www.orbit-lab.org/kernel/compat-wireless-2.6/2008/08 - PATCH_DIR:=$(if $(CONFIG_TARGET_brcm47xx),./patches-brcm,./patches-old) + PKG_MD5SUM:=9563ceeed86bca0859ad5f010623277c + PATCH_DIR:=./patches-old +else + PKG_VERSION:=2009-05-01 + PKG_RELEASE:=1 + PKG_SOURCE_URL:= \ + http://www.orbit-lab.org/kernel/compat-wireless-2.6/2009/05 \ + http://wireless.kernel.org/download/compat-wireless-2.6 + PKG_MD5SUM:=abc949ec3f7cc57302cca814d9b9c6cd endif PKG_SOURCE:=compat-wireless-$(PKG_VERSION).tar.bz2 PKG_BUILD_DIR:=$(KERNEL_BUILD_DIR)/compat-wireless-$(PKG_VERSION) +PKG_CONFIG_DEPENDS:= \ + CONFIG_PACKAGE_kmod-mac80211 \ + include $(INCLUDE_DIR)/package.mk -STAMP_CONFIGURED:=$(STAMP_CONFIGURED)_$(call confvar,CONFIG_PACKAGE_kmod-mac80211) WMENU:=Wireless Drivers -define KernelPackage/mac80211 +define KernelPackage/mac80211/Default SUBMENU:=$(WMENU) - TITLE:=Linux 802.11 Wireless Networking Stack URL:=http://linuxwireless.org/ - DEPENDS:=@LINUX_2_6 +kmod-crypto-arc4 +kmod-crypto-aes +wireless-tools @!TARGET_avr32 + DEPENDS:=@LINUX_2_6 @!TARGET_avr32 +endef + +define KernelPackage/mac80211 + $(call KernelPackage/mac80211/Default) + TITLE:=Linux 802.11 Wireless Networking Stack + DEPENDS+= +kmod-crypto-arc4 +kmod-crypto-aes +wireless-tools FILES:= \ $(PKG_BUILD_DIR)/net/mac80211/mac80211.$(LINUX_KMOD_SUFFIX) \ $(PKG_BUILD_DIR)/net/wireless/cfg80211.$(LINUX_KMOD_SUFFIX) @@ -45,17 +56,25 @@ Linux 802.11 Wireless Networking Stack endef # Prism54 drivers -P54FW:=2.7.0.0.arm +P54PCIFW:=2.13.12.0.arm +P54USBFW:=2.13.24.0.lm86.arm -define Download/p54 - FILE:=$(P54FW) - URL:=http://prism54.org/firmware - MD5SUM:=09f9da7ea757173c9de1a0322a1f9782 +define Download/p54usb + FILE:=$(P54USBFW) + URL:=http://daemonizer.de/prism54/prism54-fw/fw-usb + MD5SUM:=2efd50eab43c0d0376765576a54b7a30 endef -$(eval $(call Download,p54)) +$(eval $(call Download,p54usb)) + +define Download/p54pci + FILE:=$(P54PCIFW) + URL:=http://daemonizer.de/prism54/prism54-fw/fw-softmac + MD5SUM:=ff7536af2092b1c4b21315bd103ef4c4 +endef +$(eval $(call Download,p54pci)) define KernelPackage/p54/Default - SUBMENU:=$(WMENU) + $(call KernelPackage/mac80211/Default) TITLE:=Prism54 Drivers endef @@ -65,7 +84,7 @@ endef define KernelPackage/p54-common $(call KernelPackage/p54/Default) - DEPENDS+= @PCI_SUPPORT||USB_SUPPORT + DEPENDS+= @PCI_SUPPORT||@USB_SUPPORT +kmod-mac80211 TITLE+= (COMMON) FILES:=$(PKG_BUILD_DIR)/drivers/net/wireless/p54/p54common.$(LINUX_KMOD_SUFFIX) AUTOLOAD:=$(call AutoLoad,30,p54common) @@ -114,13 +133,13 @@ endef $(eval $(call Download,rt2860)) define KernelPackage/rt2x00/Default - SUBMENU:=$(WMENU) + $(call KernelPackage/mac80211/Default) TITLE:=Ralink Drivers for RT2x00 cards endef define KernelPackage/rt2x00-lib $(call KernelPackage/rt2x00/Default) - DEPENDS+= @PCI_SUPPORT||USB_SUPPORT +kmod-mac80211 +kmod-crc-itu-t + DEPENDS+= @PCI_SUPPORT||@USB_SUPPORT +kmod-mac80211 +kmod-crc-itu-t TITLE+= (LIB) FILES:=$(PKG_BUILD_DIR)/drivers/net/wireless/rt2x00/rt2x00lib.$(LINUX_KMOD_SUFFIX) AUTOLOAD:=$(call AutoLoad,25,blkcipher ecb arc4 rt2x00lib) @@ -184,12 +203,20 @@ endef define KernelPackage/rt2800-pci $(call KernelPackage/rt2x00/Default) - DEPENDS+= @PCI_SUPPORT +kmod-rt2x00-pci @LINUX_2_6_27||@LINUX_2_6_28 + DEPENDS+= +kmod-rt2x00-pci +kmod-crc-ccitt @!LINUX_2_6_21||!LINUX_2_6_23||!LINUX_2_6_24||!LINUX_2_6_25||!LINUX_2_6_26 TITLE+= (RT2860 PCI) FILES:=$(PKG_BUILD_DIR)/drivers/net/wireless/rt2x00/rt2800pci.$(LINUX_KMOD_SUFFIX) AUTOLOAD:=$(call AutoLoad,27,rt2800pci) endef +define KernelPackage/rt2800-usb +$(call KernelPackage/rt2x00/Default) + DEPENDS+= +kmod-rt2x00-usb +kmod-crc-ccitt @!LINUX_2_6_21||!LINUX_2_6_23||!LINUX_2_6_24||!LINUX_2_6_25||!LINUX_2_6_26 + TITLE+= (RT2870 USB) + FILES:=$(PKG_BUILD_DIR)/drivers/net/wireless/rt2x00/rt2800usb.$(LINUX_KMOD_SUFFIX) + AUTOLOAD:=$(call AutoLoad,27,rt2800usb) +endef + ZD1211FW_NAME:=zd1211-firmware ZD1211FW_VERSION:=1.4 define Download/zd1211rw @@ -200,43 +227,56 @@ endef $(eval $(call Download,zd1211rw)) define KernelPackage/zd1211rw - SUBMENU:=$(WMENU) + $(call KernelPackage/mac80211/Default) TITLE:=Zydas ZD1211 support - DEPENDS:= @USB_SUPPORT +kmod-usb-core +kmod-mac80211 + DEPENDS+= @USB_SUPPORT +kmod-usb-core +kmod-mac80211 FILES:=$(PKG_BUILD_DIR)/drivers/net/wireless/zd1211rw/zd1211rw.$(LINUX_KMOD_SUFFIX) AUTOLOAD:=$(call AutoLoad,60,zd1211rw) endef + +define KernelPackage/ath + $(call KernelPackage/mac80211/Default) + TITLE:=Atheros common driver part + DEPENDS+= @PCI_SUPPORT +kmod-mac80211 + FILES:=$(PKG_BUILD_DIR)/drivers/net/wireless/ath/ath.$(LINUX_KMOD_SUFFIX) + AUTOLOAD:=$(call AutoLoad,26,ath) +endef + +define KernelPackage/ath/description + This module contains some common parts needed by Atheros Wireless drivers. +endef + define KernelPackage/ath5k - SUBMENU:=$(WMENU) + $(call KernelPackage/mac80211/Default) TITLE:=Atheros 5xxx wireless cards support URL:=http://linuxwireless.org/en/users/Drivers/ath5k - DEPENDS+= @PCI_SUPPORT +kmod-mac80211 - FILES:=$(PKG_BUILD_DIR)/drivers/net/wireless/ath5k/ath5k.$(LINUX_KMOD_SUFFIX) + DEPENDS+= +kmod-ath + FILES:=$(PKG_BUILD_DIR)/drivers/net/wireless/ath/ath5k/ath5k.$(LINUX_KMOD_SUFFIX) AUTOLOAD:=$(call AutoLoad,27,ath5k) endef define KernelPackage/ath5k/description -This module adds support for wireless adapters based on -Atheros 5xxx chipset. + This module adds support for wireless adapters based on + Atheros 5xxx chipset. endef -define KernelPackage/ath9k-new - SUBMENU:=$(WMENU) +define KernelPackage/ath9k + $(call KernelPackage/mac80211/Default) TITLE:=Atheros 802.11n wireless cards support URL:=http://linuxwireless.org/en/users/Drivers/ath9k - DEPENDS+= @PCI_SUPPORT +kmod-mac80211 @LINUX_2_6_27||@LINUX_2_6_28 @!kmod-ath9k - FILES:=$(PKG_BUILD_DIR)/drivers/net/wireless/ath9k/ath9k.$(LINUX_KMOD_SUFFIX) + DEPENDS+= +kmod-ath @!LINUX_2_6_21||!LINUX_2_6_23||!LINUX_2_6_24||!LINUX_2_6_25||!LINUX_2_6_26 + FILES:=$(PKG_BUILD_DIR)/drivers/net/wireless/ath/ath9k/ath9k.$(LINUX_KMOD_SUFFIX) AUTOLOAD:=$(call AutoLoad,27,ath9k) endef -define KernelPackage/ath9k-new/description +define KernelPackage/ath9k/description This module adds support for wireless adapters based on Atheros IEEE 802.11n AR5008 and AR9001 family of chipsets. endef define KernelPackage/mac80211-hwsim - SUBMENU:=$(WMENU) + $(call KernelPackage/mac80211/Default) TITLE:=mac80211 HW simulation device DEPENDS+= +kmod-mac80211 FILES:=$(PKG_BUILD_DIR)/drivers/net/wireless/mac80211_hwsim.$(LINUX_KMOD_SUFFIX) @@ -244,12 +284,30 @@ define KernelPackage/mac80211-hwsim endef #Broadcom firmware -PKG_B43_FWV4_NAME:=broadcom-wl -PKG_B43_FWV4_VERSION:=4.150.10.5 -PKG_B43_FWV4_OBJECT:=driver/wl_apsta_mimo.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:=0c6ba9687114c6b598e8019e262d9a60 +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_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 +else + PKG_B43_FWV4_NAME:=broadcom-wl + PKG_B43_FWV4_VERSION:=4.150.10.5 + PKG_B43_FWV4_OBJECT:=$(PKG_B43_FWV4_NAME)-$(PKG_B43_FWV4_VERSION)/driver/wl_apsta_mimo.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:=0c6ba9687114c6b598e8019e262d9a60 +endif +ifneq ($(CONFIG_B43_OPENFIRMWARE),) + PKG_B43_FWV4_NAME:=broadcom-wl + PKG_B43_FWV4_VERSION:=5.1 + PKG_B43_FWV4_OBJECT:=openfwwf-$(PKG_B43_FWV4_VERSION) + PKG_B43_FWV4_SOURCE:=openfwwf-$(PKG_B43_FWV4_VERSION).tar.gz + PKG_B43_FWV4_SOURCE_URL:=http://www.ing.unibs.it/openfwwf/firmware/ + PKG_B43_FWV4_MD5SUM:=3510c133393bb4911c4aa35742cefcfd +endif + PKG_B43_FWV3_NAME:=wl_apsta PKG_B43_FWV3_VERSION:=3.130.20.0 @@ -257,16 +315,32 @@ 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 -PKG_B43_FWCUTTER_NAME:=b43-fwcutter -PKG_B43_FWCUTTER_VERSION:=011 -PKG_B43_FWCUTTER_SOURCE:=$(PKG_B43_FWCUTTER_NAME)-$(PKG_B43_FWCUTTER_VERSION).tar.bz2 -PKG_B43_FWCUTTER_SOURCE_URL:=http://bu3sch.de/b43/fwcutter/ -PKG_B43_FWCUTTER_MD5SUM:=3db2f4de85a459451f5b391cf67a8d44 +ifneq ($(CONFIG_B43_EXPERIMENTAL)$(CONFIG_B43_OPENFIRMWARE),) + 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 + PKG_B43_FWCUTTER_PROTO:=git + PKG_B43_FWCUTTER_SOURCE_URL:=http://git.bu3sch.de/git/b43-tools.git + PKG_B43_FWCUTTER_SUBDIR:=$(PKG_B43_FWCUTTER_NAME)-$(PKG_B43_FWCUTTER_VERSION) + PKG_B43_FWCUTTER_OBJECT:=$(PKG_B43_FWCUTTER_NAME)-$(PKG_B43_FWCUTTER_VERSION)/fwcutter/ +else + PKG_B43_FWCUTTER_NAME:=b43-fwcutter + PKG_B43_FWCUTTER_VERSION:=011 + 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:=3db2f4de85a459451f5b391cf67a8d44 + PKG_B43_FWCUTTER_SUBDIR:=b43-fwcutter-$(PKG_B43_FWCUTTER_VERSION) + PKG_B43_FWCUTTER_OBJECT:=$(PKG_B43_FWCUTTER_NAME)-$(PKG_B43_FWCUTTER_VERSION)/ +endif define Download/b43-common FILE:=$(PKG_B43_FWCUTTER_SOURCE) URL:=$(PKG_B43_FWCUTTER_SOURCE_URL) MD5SUM:=$(PKG_B43_FWCUTTER_MD5SUM) + PROTO:=$(PKG_B43_FWCUTTER_PROTO) + VERSION:=$(PKG_B43_FWCUTTER_VERSION) + SUBDIR:=$(PKG_B43_FWCUTTER_SUBDIR) endef $(eval $(call Download,b43-common)) @@ -285,10 +359,10 @@ endef $(eval $(call Download,b43legacy)) define KernelPackage/b43-common - SUBMENU:=$(WMENU) + $(call KernelPackage/mac80211/Default) TITLE:=Generic stuff for Broadcom wireless devices URL:=http://linuxwireless.org/en/users/Drivers/b43 - DEPENDS:=+kmod-mac80211 +!TARGET_brcm47xx:kmod-ssb + DEPENDS+= +kmod-mac80211 +!(TARGET_brcm47xx||TARGET_brcm63xx):kmod-ssb @!LINUX_2_6_21||!LINUX_2_6_23||!LINUX_2_6_24 endef define KernelPackage/b43 @@ -298,6 +372,10 @@ $(call KernelPackage/b43-common) AUTOLOAD:=$(call AutoLoad,30,b43) endef +define KernelPackage/b43/config + source "$(SOURCE)/Config.in" +endef + define KernelPackage/b43/description Kernel module for Broadcom 43xx wireless support (mac80211 stack) new endef @@ -316,7 +394,13 @@ endef BUILDFLAGS:= \ -I$(PKG_BUILD_DIR)/include \ $(foreach opt,$(CONFOPTS),-DCONFIG_$(opt)) \ - $(if $(CONFIG_LEDS_TRIGGERS), -DCONFIG_MAC80211_LEDS -DCONFIG_LEDS_TRIGGERS) \ + $(if $(CONFIG_PCI),-DCONFIG_B43_PCI_AUTOSELECT -DCONFIG_B43_PCICORE_AUTOSELECT -DCONFIG_SSB_DRIVER_PCICORE_POSSIBLE -DCONFIG_SSB_DRIVER_PCICORE) \ + $(if $(CONFIG_PCI),-DCONFIG_SSB_PCIHOST_POSSIBLE -DCONFIG_SSB_PCIHOST) \ + $(if $(CONFIG_PCI),-DCONFIG_SSB_SPROM) \ + $(if $(CONFIG_LEDS_TRIGGERS), -DCONFIG_MAC80211_LEDS -DCONFIG_LEDS_TRIGGERS -DCONFIG_B43_LEDS -DCONFIG_B43LEGACY_LEDS) \ + $(if $(CONFIG_RFKILL),-DCONFIG_B43_RFKILL -DCONFIG_B43LEGACY_RFKILL) \ + $(if $(CONFIG_HW_RANDOM),-DCONFIG_B43_HWRNG -DCONFIG_B43LEGACY_HWRNG) \ + $(if $(CONFIG_PCMCIA),-DCONFIG_SSB_PCMCIAHOST_POSSIBLE -DCONFIG_SSB_PCMCIAHOST -DCONFIG_B43_PCMCIA -DCONFIG_B43_PIO) \ $(if $(CONFIG_DEBUG_FS), -DCONFIG_MAC80211_DEBUGFS) \ -D__CONFIG_MAC80211_RC_DEFAULT=minstrel \ @@ -330,6 +414,24 @@ MAKE_OPTS:= \ CONFIG_MAC80211_RC_MINSTREL=y \ CONFIG_MAC80211_LEDS=$(CONFIG_LEDS_TRIGGERS) \ CONFIG_MAC80211_DEBUGFS=$(CONFIG_DEBUG_FS) \ + $(if $(CONFIG_PCI),CONFIG_B43_PCI_AUTOSELECT=y,CONFIG_B43_PCI_AUTOSELECT=n) \ + $(if $(CONFIG_PCI),CONFIG_B43_PCICORE_AUTOSELECT=y,CONFIG_B43_PCICORE_AUTOSELECT=n) \ + $(if $(CONFIG_PCI),CONFIG_SSB_DRIVER_PCICORE_POSSIBLE=y,CONFIG_SSB_DRIVER_PCICORE_POSSIBLE=n) \ + $(if $(CONFIG_PCI),CONFIG_SSB_DRIVER_PCICORE=y,CONFIG_SSB_DRIVER_PCICORE=n) \ + $(if $(CONFIG_PCI),CONFIG_SSB_PCIHOST_POSSIBLE=y,CONFIG_SSB_PCIHOST_POSSIBLE=n) \ + $(if $(CONFIG_PCI),CONFIG_SSB_PCIHOST=y,CONFIG_SSB_PCIHOST=n) \ + $(if $(CONFIG_PCMCIA),CONFIG_SSB_PCMCIAHOST_POSSIBLE=y,CONFIG_SSB_PCMCIAHOST_POSSIBLE=n) \ + $(if $(CONFIG_PCMCIA),CONFIG_SSB_PCMCIAHOST=y,CONFIG_SSB_PCMCIAHOST=n) \ + $(if $(CONFIG_PCMCIA),CONFIG_B43_PCMCIA=y,CONFIG_B43_PCMCIA=n) \ + $(if $(CONFIG_PCMCIA),CONFIG_B43_PIO=y,CONFIG_B43_PIO=n) \ + $(if $(CONFIG_RFKILL),CONFIG_B43_RFKILL=y,CONFIG_B43_RFKILL=n) \ + $(if $(CONFIG_RFKILL),CONFIG_B43LEGACY_RFKILL=y,CONFIG_B43LEGACY_RFKILL=n) \ + CONFIG_B43LEGACY_LEDS=$(CONFIG_LEDS_TRIGGERS) \ + CONFIG_B43_LEDS=$(CONFIG_LEDS_TRIGGERS) \ + $(if $(CONFIG_HW_RANDOM),CONFIG_B43_HWRNG=y,CONFIG_B43_HWRNG=n) \ + $(if $(CONFIG_HW_RANDOM),CONFIG_B43LEGACY_HWRNG=y,CONFIG_B43LEGACY_HWRNG=n) \ + $(if $(CONFIG_PACKAGE_kmod-b43),CONFIG_B43=m) \ + $(if $(CONFIG_PACKAGE_kmod-b43legacy),CONFIG_B43LEGACY=m) \ KLIB_BUILD="$(LINUX_DIR)" \ MODPROBE=: @@ -338,20 +440,18 @@ define Build/Prepare mkdir -p $(PKG_BUILD_DIR) $(PKG_UNPACK) $(Build/Patch) - $(if $(QUILT),touch $(PKG_BUILD_DIR)/.quilt_used) unzip -jod $(PKG_BUILD_DIR) $(DL_DIR)/$(RT61FW) unzip -jod $(PKG_BUILD_DIR) $(DL_DIR)/$(RT71FW) -unzip -jod $(PKG_BUILD_DIR) $(DL_DIR)/$(RT2860FW) $(TAR) -C $(PKG_BUILD_DIR) -xjf $(DL_DIR)/$(ZD1211FW_NAME)-$(ZD1211FW_VERSION).tar.bz2 - $(if $(CONFIG_TARGET_brcm47xx),rm -rf $(PKG_BUILD_DIR)/include/linux/ssb) - rm $(PKG_BUILD_DIR)/include/net/ieee80211_crypt.h - rm $(PKG_BUILD_DIR)/include/net/ieee80211.h - rm $(PKG_BUILD_DIR)/include/net/ieee80211_radiotap.h + rm -rf $(PKG_BUILD_DIR)/include/linux/ssb + rm -f $(PKG_BUILD_DIR)/include/net/ieee80211.h rm $(PKG_BUILD_DIR)/include/linux/eeprom_93cx6.h endef ifneq ($(CONFIG_PACKAGE_kmod-mac80211),) define Build/Compile/kmod + rm -rf $(PKG_BUILD_DIR)/modules $(MAKE) -C "$(PKG_BUILD_DIR)" $(MAKE_OPTS) all endef endif @@ -371,9 +471,14 @@ define KernelPackage/mac80211/install $(INSTALL_DATA) ./files/lib/wifi/mac80211.sh $(1)/lib/wifi endef -define KernelPackage/p54-common/install +define KernelPackage/p54-pci/install + $(INSTALL_DIR) $(1)/lib/firmware + $(INSTALL_DATA) $(DL_DIR)/$(P54PCIFW) $(1)/lib/firmware/isl3886pci +endef + +define KernelPackage/p54-usb/install $(INSTALL_DIR) $(1)/lib/firmware - $(INSTALL_DATA) $(DL_DIR)/$(P54FW) $(1)/lib/firmware/isl3886 + $(INSTALL_DATA) $(DL_DIR)/$(P54USBFW) $(1)/lib/firmware/isl3886usb endef define KernelPackage/rt61-pci/install @@ -398,27 +503,46 @@ endef define Build/b43-common tar xjf "$(DL_DIR)/$(PKG_B43_FWCUTTER_SOURCE)" -C "$(PKG_BUILD_DIR)" - $(MAKE) -C "$(PKG_BUILD_DIR)/$(PKG_B43_FWCUTTER_NAME)-$(PKG_B43_FWCUTTER_VERSION)" \ + $(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),) + $(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/ + $(INSTALL_BIN) $(PKG_BUILD_DIR)/$(PKG_B43_FWCUTTER_SUBDIR)/assembler/b43-asm.bin $(STAGING_DIR_HOST)/bin/ +endif + $(INSTALL_BIN) ./files/host_bin/b43-fwsquash.py $(STAGING_DIR_HOST)/bin/ endef define KernelPackage/b43/install + rm -rf $(1)/lib/firmware/ $(call Build/b43-common) +ifneq ($(CONFIG_B43_OPENFIRMWARE),) + 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/ - - $(PKG_BUILD_DIR)/$(PKG_B43_FWCUTTER_NAME)-$(PKG_B43_FWCUTTER_VERSION)/b43-fwcutter \ - -w $(1)/lib/firmware/ \ - $(PKG_BUILD_DIR)/$(PKG_B43_FWV4_NAME)-$(PKG_B43_FWV4_VERSION)/$(PKG_B43_FWV4_OBJECT) +ifneq ($(CONFIG_B43_OPENFIRMWARE),) + $(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) +endif +ifneq ($(CONFIG_B43_FW_SQUASH),) + b43-fwsquash.py "$(CONFIG_B43_FW_SQUASH_PHYTYPES)" "$(CONFIG_B43_FW_SQUASH_COREREVS)" "$(1)/lib/firmware/b43" +endif endef define KernelPackage/b43legacy/install $(call Build/b43-common) $(INSTALL_DIR) $(1)/lib/firmware/ - $(PKG_BUILD_DIR)/$(PKG_B43_FWCUTTER_NAME)-$(PKG_B43_FWCUTTER_VERSION)/b43-fwcutter \ - -w $(1)/lib/firmware/ \ - $(DL_DIR)/$(PKG_B43_FWV3_SOURCE) + b43-fwcutter --unsupported -w $(1)/lib/firmware/ $(DL_DIR)/$(PKG_B43_FWV3_SOURCE) endef $(eval $(call KernelPackage,ath5k)) @@ -435,8 +559,10 @@ $(eval $(call KernelPackage,rt2500-usb)) $(eval $(call KernelPackage,rt61-pci)) $(eval $(call KernelPackage,rt73-usb)) $(eval $(call KernelPackage,rt2800-pci)) +$(eval $(call KernelPackage,rt2800-usb)) $(eval $(call KernelPackage,zd1211rw)) $(eval $(call KernelPackage,mac80211-hwsim)) -$(eval $(call KernelPackage,ath9k-new)) +$(eval $(call KernelPackage,ath9k)) +$(eval $(call KernelPackage,ath)) $(eval $(call KernelPackage,b43)) $(eval $(call KernelPackage,b43legacy))