revert accidental change to madwifi.sh

[openwrt.git] / package / mac80211 / Makefile

diff --git a/package/mac80211/Makefile b/package/mac80211/Makefile
index f71652d..7cf428c 100644 (file)
--- a/package/mac80211/Makefile
+++ b/package/mac80211/Makefile
@@ -1,5 +1,5 @@
-# 
-# Copyright (C) 2007 OpenWrt.org
+#
+# Copyright (C) 2007-2008 OpenWrt.org

 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.


@@ -12,17 +12,17 @@ include $(INCLUDE_DIR)/kernel.mk
 PKG_NAME:=mac80211
 PKG_RELEASE:=1
 
 PKG_NAME:=mac80211
 PKG_RELEASE:=1
 

-PKG_VERSION:=2008-04-07
+PKG_VERSION:=2008-08-06

 PKG_SOURCE:=compat-wireless-$(PKG_VERSION).tar.bz2
 PKG_SOURCE:=compat-wireless-$(PKG_VERSION).tar.bz2

-PKG_SOURCE_URL:=http://linuxwireless.org/download/compat-wireless-2.6/
-PKG_BUILD_DIR:=$(BUILD_DIR)/compat-wireless-$(PKG_VERSION)
+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
 
 define KernelPackage/mac80211
   SUBMENU:=Wireless Drivers
   TITLE:=Linux 802.11 Wireless Networking Stack
 
 include $(INCLUDE_DIR)/package.mk
 
 define KernelPackage/mac80211
   SUBMENU:=Wireless Drivers
   TITLE:=Linux 802.11 Wireless Networking Stack

-  DEPENDS:=@LINUX_2_6_23||@LINUX_2_6_24 +kmod-crypto-arc4 +kmod-crypto-aes +wireless-tools
+  DEPENDS:=@LINUX_2_6 +kmod-crypto-arc4 +kmod-crypto-aes +wireless-tools @!TARGET_avr32

   FILES:= \
        $(PKG_BUILD_DIR)/net/mac80211/mac80211.$(LINUX_KMOD_SUFFIX) \
        $(PKG_BUILD_DIR)/net/wireless/cfg80211.$(LINUX_KMOD_SUFFIX)
   FILES:= \
        $(PKG_BUILD_DIR)/net/mac80211/mac80211.$(LINUX_KMOD_SUFFIX) \
        $(PKG_BUILD_DIR)/net/wireless/cfg80211.$(LINUX_KMOD_SUFFIX)


@@ -54,7 +54,7 @@ $(eval $(call Download,rt71w))
 define KernelPackage/rt2x00/Default
   SUBMENU:=Wireless Drivers
   TITLE:=Ralink Drivers for RT2x00 cards
 define KernelPackage/rt2x00/Default
   SUBMENU:=Wireless Drivers
   TITLE:=Ralink Drivers for RT2x00 cards

-  DEPENDS:=@LINUX_2_6_24 @!TARGET_atheros @!TARGET_uml
+  DEPENDS:=@LINUX_2_6_24||LINUX_2_6_25

 endef
 
 define KernelPackage/rt2x00-lib
 endef
 
 define KernelPackage/rt2x00-lib


@@ -121,35 +121,21 @@ define KernelPackage/rt73-usb
   AUTOLOAD:=$(call AutoLoad,27,rt73usb)
 endef
 
   AUTOLOAD:=$(call AutoLoad,27,rt73usb)
 endef
 

-RT2X00_CONFOPTS:=CONFIG_RT2X00=y \
-               CONFIG_RT2X00_DEBUG=y \
-               CONFIG_RT2X00_LIB_FIRMWARE=y \
-               CONFIG_RT2X00_LIB_LEDS=y
-
-ifneq ($(CONFIG_PACKAGE_kmod-rt2x00-pci),)
-  RT2X00_CONFOPTS+= CONFIG_RT2X00_LIB_PCI=y
-endif
-ifneq ($(CONFIG_PACKAGE_kmod-rt2x00-usb),)
-  RT2X00_CONFOPTS+= CONFIG_RT2X00_LIB_USB=y
-endif
-ifneq ($(CONFIG_PACKAGE_kmod-rt2400-pci),)
-  RT2X00_CONFOPTS+= CONFIG_RT2400PCI=y
-endif
-ifneq ($(CONFIG_PACKAGE_kmod-rt2500-pci),)
-  RT2X00_CONFOPTS+= CONFIG_RT2500PCI=y
-endif
-ifneq ($(CONFIG_PACKAGE_kmod-rt2500-usb),)
-  RT2X00_CONFOPTS+= CONFIG_RT2500USB=y
-endif
-ifneq ($(CONFIG_PACKAGE_kmod-rt61-pci),)
-  RT2X00_CONFOPTS+= CONFIG_RT61PCI=y
-endif
-ifneq ($(CONFIG_PACKAGE_kmod-rt73-usb),)
-  RT2X00_CONFOPTS+= CONFIG_RT73USB=y
-endif
-
+define KernelPackage/net-zd1211rw
+  SUBMENU:=Wireless Drivers
+  TITLE:=Zydas ZD1211 support
+  DEPENDS:=@LINUX_2_6_24||LINUX_2_6_25 @USB_SUPPORT +kmod-ieee80211-softmac
+  FILES:=$(PKG_BUILD_DIR)/drivers/net/wireless/zd1211rw/zd1211rw.$(LINUX_KMOD_SUFFIX)
+  AUTOLOAD:=$(call AutoLoad,60,zd1211rw)
+endef

 
 

-CONFOPTS:=MAC80211 CFG80211 NL80211 MAC80211_RC_DEFAULT_PID MAC80211_RC_PID \
+define KernelPackage/ath5k
+  SUBMENU:=Wireless Drivers
+  TITLE:=Atheros 5xxx wireless cards support
+  DEPENDS+= @PCI_SUPPORT +kmod-mac80211
+  FILES:=$(PKG_BUILD_DIR)/drivers/net/wireless/ath5k/ath5k.$(LINUX_KMOD_SUFFIX)
+  AUTOLOAD:=$(call AutoLoad,27,ath5k)
+endef

 
 BUILDFLAGS:= \
        $(foreach opt,$(CONFOPTS),-DCONFIG_$(opt)) \
 
 BUILDFLAGS:= \
        $(foreach opt,$(CONFOPTS),-DCONFIG_$(opt)) \


@@ -171,18 +157,27 @@ define Build/Prepare
        rm -rf $(PKG_BUILD_DIR)
        mkdir -p $(PKG_BUILD_DIR)
        $(PKG_UNPACK)
        rm -rf $(PKG_BUILD_DIR)
        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)
        $(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

 endef
 
 endef
 

-define Build/Compile
+ifneq ($(CONFIG_PACKAGE_kmod-mac80211),)
+ define Build/Compile/kmod

        $(MAKE) -C "$(PKG_BUILD_DIR)" $(MAKE_OPTS) all
        $(MAKE) -C "$(PKG_BUILD_DIR)" $(MAKE_OPTS) all

+ endef
+endif
+
+define Build/Compile
+       $(call Build/Compile/kmod)

 endef
 
 define Build/InstallDev
 endef
 
 define Build/InstallDev

-       mkdir -p $(1)/usr/include/mac80211
+       mkdir -p $(1)/usr/include/mac80211 $(1)/usr/include/net/mac80211

        $(CP) $(PKG_BUILD_DIR)/net/mac80211/*.h $(PKG_BUILD_DIR)/include/* $(1)/usr/include/mac80211/
        $(CP) $(PKG_BUILD_DIR)/net/mac80211/*.h $(PKG_BUILD_DIR)/include/* $(1)/usr/include/mac80211/

+       $(CP) $(PKG_BUILD_DIR)/net/mac80211/rate.h $(1)/usr/include/net/mac80211/

 endef
 
 define KernelPackage/mac80211/install
 endef
 
 define KernelPackage/mac80211/install


@@ -200,7 +195,8 @@ define KernelPackage/rt73-usb/install
        $(INSTALL_DATA) $(PKG_BUILD_DIR)/rt73.bin $(1)/lib/firmware/
 endef
 
        $(INSTALL_DATA) $(PKG_BUILD_DIR)/rt73.bin $(1)/lib/firmware/
 endef
 

-
+$(eval $(call KernelPackage,ath5k))
+$(eval $(call KernelPackage,net-zd1211rw))

 $(eval $(call KernelPackage,mac80211))
 $(eval $(call KernelPackage,rt2x00-lib))
 $(eval $(call KernelPackage,rt2x00-pci))
 $(eval $(call KernelPackage,mac80211))
 $(eval $(call KernelPackage,rt2x00-lib))
 $(eval $(call KernelPackage,rt2x00-pci))