X-Git-Url: http://git.openwrt.org/?a=blobdiff_plain;ds=sidebyside;f=package%2Fmac80211%2FMakefile;h=42f3e9a5ff55ac58f9cacedbca734a5bbf4792da;hb=a4891ea4d6f08fefa8754616cd71fdc3e8c4024a;hp=1e515575b76feb51507beee1003f44d5201ec927;hpb=aebd1654e943404ef120413e07ce79a2afb65245;p=openwrt%2Fstaging%2Fflorian.git diff --git a/package/mac80211/Makefile b/package/mac80211/Makefile index 1e515575b7..42f3e9a5ff 100644 --- a/package/mac80211/Makefile +++ b/package/mac80211/Makefile @@ -10,19 +10,19 @@ include $(INCLUDE_DIR)/kernel.mk PKG_NAME:=mac80211 -ifneq ($(CONFIG_LINUX_2_6_27)$(CONFIG_LINUX_2_6_28),) - PKG_VERSION:=2009-03-05 - PKG_RELEASE:=1 - PKG_SOURCE_URL:= \ - http://www.orbit-lab.org/kernel/compat-wireless-2.6/2009/03 \ - http://wireless.kernel.org/download/compat-wireless-2.6 - PKG_MD5SUM:=3e96bcca2be64536e206e425f0f26cfd -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 PKG_MD5SUM:=9563ceeed86bca0859ad5f010623277c PATCH_DIR:=./patches-old +else + PKG_VERSION:=2009-03-31 + PKG_RELEASE:=1 + PKG_SOURCE_URL:= \ + http://www.orbit-lab.org/kernel/compat-wireless-2.6/2009/03 \ + http://wireless.kernel.org/download/compat-wireless-2.6 + PKG_MD5SUM:=b5b2159081c36dd6c318a28eddf7e646 endif PKG_SOURCE:=compat-wireless-$(PKG_VERSION).tar.bz2 @@ -60,7 +60,7 @@ P54USBFW:=2.13.24.0.lm86.arm define Download/p54usb FILE:=$(P54USBFW) URL:=http://daemonizer.de/prism54/prism54-fw/fw-usb - MD5SUM:=2e847782bb36d5b0863db8b2f12c2228 + MD5SUM:=2efd50eab43c0d0376765576a54b7a30 endef $(eval $(call Download,p54usb)) @@ -201,7 +201,7 @@ endef define KernelPackage/rt2800-pci $(call KernelPackage/rt2x00/Default) - DEPENDS+= +kmod-rt2x00-pci +kmod-crc-ccitt @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) @@ -209,7 +209,7 @@ endef define KernelPackage/rt2800-usb $(call KernelPackage/rt2x00/Default) - DEPENDS+= +kmod-rt2x00-usb +kmod-crc-ccitt @LINUX_2_6_27||@LINUX_2_6_28 + 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) @@ -250,7 +250,7 @@ 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 + DEPENDS+= @PCI_SUPPORT +kmod-mac80211 @!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/ath9k/ath9k.$(LINUX_KMOD_SUFFIX) AUTOLOAD:=$(call AutoLoad,27,ath9k) endef @@ -347,7 +347,7 @@ define KernelPackage/b43-common $(call KernelPackage/mac80211/Default) TITLE:=Generic stuff for Broadcom wireless devices URL:=http://linuxwireless.org/en/users/Drivers/b43 - DEPENDS+= +kmod-mac80211 @TARGET_brcm47xx||@TARGET_brcm63xx @LINUX_2_6_25||@LINUX_2_6_26||@LINUX_2_6_27||@LINUX_2_6_28 + DEPENDS+= +kmod-mac80211 @TARGET_brcm47xx||@TARGET_brcm63xx @!LINUX_2_6_21||!LINUX_2_6_23||!LINUX_2_6_24 endef define KernelPackage/b43 @@ -379,9 +379,13 @@ endef BUILDFLAGS:= \ -I$(PKG_BUILD_DIR)/include \ $(foreach opt,$(CONFOPTS),-DCONFIG_$(opt)) \ + $(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_PCMCIA),-DCONFIG_B43_PCMCIA) \ + $(if $(CONFIG_HW_RANDOM),-DCONFIG_B43_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 \ @@ -395,11 +399,21 @@ MAKE_OPTS:= \ CONFIG_MAC80211_RC_MINSTREL=y \ CONFIG_MAC80211_LEDS=$(CONFIG_LEDS_TRIGGERS) \ CONFIG_MAC80211_DEBUGFS=$(CONFIG_DEBUG_FS) \ - CONFIG_B43_PCMCIA=$(CONFIG_PCMCIA) \ - CONFIG_B43_RFKILL=$(CONFIG_RFKILL) \ - CONFIG_B43LEGACY_RFKILL=$(CONFIG_RFKILL) \ + $(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_PACKAGE_kmod-b43),CONFIG_B43=m) \ $(if $(CONFIG_PACKAGE_kmod-b43legacy),CONFIG_B43LEGACY=m) \ KLIB_BUILD="$(LINUX_DIR)" \ @@ -416,7 +430,6 @@ define Build/Prepare $(TAR) -C $(PKG_BUILD_DIR) -xjf $(DL_DIR)/$(ZD1211FW_NAME)-$(ZD1211FW_VERSION).tar.bz2 rm -rf $(PKG_BUILD_DIR)/include/linux/ssb rm -f $(PKG_BUILD_DIR)/include/net/ieee80211.h - rm $(PKG_BUILD_DIR)/include/net/ieee80211_radiotap.h rm $(PKG_BUILD_DIR)/include/linux/eeprom_93cx6.h endef @@ -483,6 +496,7 @@ ifneq ($(CONFIG_B43_OPENFIRMWARE),) $(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 @@ -503,6 +517,9 @@ ifneq ($(CONFIG_B43_OPENFIRMWARE),) 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