fix typo

[openwrt/svn-archive/archive.git] / package / mac80211 / Makefile

diff --git a/package/mac80211/Makefile b/package/mac80211/Makefile
index a3b483cb52bd53e7ec2ceebbbf6b43c9272fa4ee..06e15532bf27d9e3e998e619b46264fd7f6bd3dd 100644 (file)
--- a/package/mac80211/Makefile
+++ b/package/mac80211/Makefile
@@ -12,9 +12,16 @@ include $(INCLUDE_DIR)/kernel.mk
 PKG_NAME:=mac80211
 PKG_RELEASE:=1
 
-PKG_VERSION:=2008-08-06
+ifneq ($(CONFIG_LINUX_2_6_27),)
+  PKG_VERSION:=2008-10-08
+  PKG_SOURCE_URL:=http://www.orbit-lab.org/kernel/compat-wireless-2.6/2008/10
+else
+  PKG_VERSION:=2008-08-06
+  PKG_SOURCE_URL:=http://www.orbit-lab.org/kernel/compat-wireless-2.6/2008/08
+  PATCH_DIR:=./patches-old
+endif
+
 PKG_SOURCE:=compat-wireless-$(PKG_VERSION).tar.bz2
-PKG_SOURCE_URL:=http://www.orbit-lab.org/kernel/compat-wireless-2.6/2008/08/
 PKG_BUILD_DIR:=$(KERNEL_BUILD_DIR)/compat-wireless-$(PKG_VERSION)
 
 include $(INCLUDE_DIR)/package.mk
@@ -120,10 +127,19 @@ define KernelPackage/rt73-usb
   AUTOLOAD:=$(call AutoLoad,27,rt73usb)
 endef
 
-define KernelPackage/net-zd1211rw
+ZD1211FW_NAME:=zd1211-firmware
+ZD1211FW_VERSION:=1.4
+define Download/zd1211rw
+  FILE:=$(ZD1211FW_NAME)-$(ZD1211FW_VERSION).tar.bz2
+  URL:=@SF/zd1211/
+  MD5SUM:=19f28781d76569af8551c9d11294c870
+endef
+$(eval $(call Download,zd1211rw))
+
+define KernelPackage/zd1211rw
   SUBMENU:=Wireless Drivers
   TITLE:=Zydas ZD1211 support
-  DEPENDS:=@LINUX_2_6_24||LINUX_2_6_25 @USB_SUPPORT +kmod-ieee80211-softmac
+  DEPENDS:=@LINUX_2_6_24||@LINUX_2_6_25||@LINUX_2_6_26||@LINUX_2_6_27 @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
@@ -137,9 +153,11 @@ define KernelPackage/ath5k
 endef
 
 BUILDFLAGS:= \
+       -I$(PKG_BUILD_DIR)/include \
        $(foreach opt,$(CONFOPTS),-DCONFIG_$(opt)) \
        $(if $(CONFIG_LEDS_TRIGGERS), -DCONFIG_MAC80211_LEDS -DCONFIG_LEDS_TRIGGERS) \
-       -D__CONFIG_MAC80211_RC_DEFAULT=pid \
+       $(if $(CONFIG_DEBUG_FS), -DCONFIG_MAC80211_DEBUGFS) \
+       -D__CONFIG_MAC80211_RC_DEFAULT=minstrel \
 
 MAKE_OPTS:= \
        CROSS_COMPILE="$(TARGET_CROSS)" \
@@ -148,9 +166,11 @@ MAKE_OPTS:= \
        $(foreach opt,$(CONFOPTS),CONFIG_$(opt)=m) \
        CONFIG_NL80211=y \
        CONFIG_MAC80211_RC_PID=y \
+       CONFIG_MAC80211_RC_MINSTREL=y \
        CONFIG_MAC80211_LEDS=$(CONFIG_LEDS_TRIGGERS) \
-       LINUXINCLUDE="-I$(PKG_BUILD_DIR)/include -I$(LINUX_DIR)/include -include linux/autoconf.h" \
+       CONFIG_MAC80211_DEBUGFS=$(CONFIG_DEBUG_FS) \
        KLIB_BUILD="$(LINUX_DIR)" \
+       MODPROBE=:
 
 define Build/Prepare
        rm -rf $(PKG_BUILD_DIR)
@@ -160,7 +180,8 @@ define Build/Prepare
        $(if $(QUILT),touch $(PKG_BUILD_DIR)/.quilt_used)
        unzip -jod $(PKG_BUILD_DIR) $(DL_DIR)/$(RT61FW)
        unzip -jod $(PKG_BUILD_DIR) $(DL_DIR)/$(RT71FW)
-       rm -rf $(PKG_BUILD_DIR)/include/linux/ssb
+       $(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)
 endef
 
 ifneq ($(CONFIG_PACKAGE_kmod-mac80211),)
@@ -194,8 +215,12 @@ define KernelPackage/rt73-usb/install
        $(INSTALL_DATA) $(PKG_BUILD_DIR)/rt73.bin $(1)/lib/firmware/
 endef
 
+define KernelPackage/zd1211rw/install
+       $(INSTALL_DIR) $(1)/lib/firmware/zd1211
+       $(INSTALL_DATA) $(PKG_BUILD_DIR)/$(ZD1211FW_NAME)/zd1211* $(1)/lib/firmware/zd1211
+endef
+
 $(eval $(call KernelPackage,ath5k))
-$(eval $(call KernelPackage,net-zd1211rw))
 $(eval $(call KernelPackage,mac80211))
 $(eval $(call KernelPackage,rt2x00-lib))
 $(eval $(call KernelPackage,rt2x00-pci))
@@ -205,3 +230,4 @@ $(eval $(call KernelPackage,rt2500-pci))
 $(eval $(call KernelPackage,rt2500-usb))
 $(eval $(call KernelPackage,rt61-pci))
 $(eval $(call KernelPackage,rt73-usb))
+$(eval $(call KernelPackage,zd1211rw))