X-Git-Url: http://git.openwrt.org/?p=openwrt%2Fsvn-archive%2Farchive.git;a=blobdiff_plain;f=package%2Fkernel%2Fmodules%2Fwireless.mk;h=698e9683ef75f22c6d0a87994cca3a2ea660b5b8;hp=61171d50ac22fe5790e2a73f05bf9c56dc0258de;hb=d69e2c86ae04b7f96c9c82345d15515f1c3c2713;hpb=50a6218b4b478741842b3a7874ab46eed3adc5f9;ds=sidebyside

diff --git a/package/kernel/modules/wireless.mk b/package/kernel/modules/wireless.mk
index 61171d50ac..698e9683ef 100644
--- a/package/kernel/modules/wireless.mk
+++ b/package/kernel/modules/wireless.mk
@@ -1,159 +1,141 @@
-# 
-# Copyright (C) 2006 OpenWrt.org
+#
+# Copyright (C) 2006-2008 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
 #
-# $Id$
 
-WIMENU:=Wireless Drivers
+WIRELESS_MENU:=Wireless Drivers
 
-define KernelPackage/ieee80211
+define KernelPackage/lib80211
+  SUBMENU:=$(WIRELESS_MENU)
   TITLE:=802.11 Networking stack
-  DESCRIPTION:=\\\
-	\\\
-	Includes: \\\
-	- ieee80211_crypt \\\
-	- ieee80211 \\\
-	- ieee80211_crypt_wep \\\
-	- ieee80211_crypt_tkip \\\
-	- ieee80211_crytp_ccmp \\\
-  DEPENDS:=@LINUX_2_6 kmod-crypto
-  KCONFIG:=$(CONFIG_IEEE80211)
+  KCONFIG:= \
+	CONFIG_LIB80211 \
+	CONFIG_LIB80211_CRYPT_WEP \
+	CONFIG_LIB80211_CRYPT_TKIP \
+	CONFIG_LIB80211_CRYPT_CCMP
   FILES:= \
-  	$(MODULES_DIR)/kernel/net/ieee80211/*.$(LINUX_KMOD_SUFFIX)
+  	$(LINUX_DIR)/net/wireless/lib80211.ko \
+  	$(LINUX_DIR)/net/wireless/lib80211_crypt_wep.ko \
+  	$(LINUX_DIR)/net/wireless/lib80211_crypt_ccmp.ko \
+  	$(LINUX_DIR)/net/wireless/lib80211_crypt_tkip.ko
   AUTOLOAD:=$(call AutoLoad,10, \
-	ieee80211_crypt \
-	ieee80211 \
-	ieee80211_crypt_wep \
-	ieee80211_crypt_tkip \
-	ieee80211_crypt_ccmp \
+	lib80211 \
+	lib80211_crypt_wep \
+	lib80211_crypt_ccmp \
+	lib80211_crypt_tkip \
   )
-  SUBMENU:=$(WIMENU)
 endef
-$(eval $(call KernelPackage,ieee80211))
-
 
-define KernelPackage/ieee80211-softmac
-  TITLE:=ieee80211 SoftMAC support
-  DEPENDS:=kmod-ieee80211
-  KCONFIG:=$(CONFIG_IEEE80211_SOFTMAC)
-  FILES:= \
-	$(MODULES_DIR)/kernel/net/ieee80211/softmac/*.$(LINUX_KMOD_SUFFIX)
-  AUTOLOAD:=$(call AutoLoad,20,ieee80211softmac)
-  SUBMENU:=$(WIMENU)
-endef
-$(eval $(call KernelPackage,ieee80211-softmac))
-
-
-define KernelPackage/net-bcm43xx
-  TITLE:=Broadcom BCM43xx driver
-  DESCRIPTION:=\\\
-	\\\
-	Includes: \\\
-	- bcm43xx
-  DEPENDS:=kmod-ieee80211-softmac
-  KCONFIG:=$(CONFIG_BCM43XX)
-  FILES:=$(MODULES_DIR)/kernel/drivers/net/wireless/bcm43xx/bcm43xx.$(LINUX_KMOD_SUFFIX)
-  AUTOLOAD:=$(call AutoLoad,50,bcm43xx)
-  SUBMENU:=$(WIMENU)
-endef
-$(eval $(call KernelPackage,net-bcm43xx))
-
-define KernelPackage/net-ipw2100
-  TITLE:=Intel IPW2100 driver
-  DESCRIPTION:=\\\
-	\\\
-	Includes: \\\
-	- ipw2100
-  DEPENDS:=kmod-ieee80211
-  KCONFIG:=$(CONFIG_IPW2100)
-  FILES:=$(MODULES_DIR)/kernel/drivers/net/wireless/ipw2100.$(LINUX_KMOD_SUFFIX)
-  AUTOLOAD:=$(call AutoLoad,50,ipw2100)
-  SUBMENU:=$(WIMENU)
-endef
-$(eval $(call KernelPackage,net-ipw2100))
-
-define KernelPackage/net-ipw2200
-  TITLE:=Intel IPW2200 driver
-  DESCRIPTION:=\\\
-	\\\
-	Includes: \\\
-	- ipw2200
-  DEPENDS:=kmod-ieee80211
-  KCONFIG:=$(CONFIG_IPW2200)
-  FILES:=$(MODULES_DIR)/kernel/drivers/net/wireless/ipw2200.$(LINUX_KMOD_SUFFIX)
-  AUTOLOAD:=$(call AutoLoad,50,ipw2200)
-  SUBMENU:=$(WIMENU)
+define KernelPackage/lib80211/description
+ Kernel modules for 802.11 Networking stack
+ Includes:
+ - lib80211
+ - lib80211_crypt_wep
+ - lib80211_crypt_tkip
+ - lib80211_crytp_ccmp
 endef
-$(eval $(call KernelPackage,net-ipw2200))
 
+$(eval $(call KernelPackage,lib80211))
 
 define KernelPackage/net-airo
+  SUBMENU:=$(WIRELESS_MENU)
   TITLE:=Cisco Aironet driver
-  DESCRIPTION:=Driver for Cisco Aironet cards
-  KCONFIG:=$(CONFIG_AIRO)
-  SUBMENU:=$(WIMENU)
-  FILES:=$(MODULES_DIR)/kernel/drivers/net/wireless/airo.$(LINUX_KMOD_SUFFIX)
+  DEPENDS:=@PCI_SUPPORT +@DRIVER_WEXT_SUPPORT
+  KCONFIG:=CONFIG_AIRO
+  FILES:=$(LINUX_DIR)/drivers/net/wireless/airo.ko
   AUTOLOAD:=$(call AutoLoad,50,airo)
 endef
+
+define KernelPackage/net-airo/description
+ Kernel support for Cisco Aironet cards
+endef
+
 $(eval $(call KernelPackage,net-airo))
 
 
-define KernelPackage/net-hermes
-  TITLE:=Hermes 802.11b chipset support
-  DESCRIPTION:=Kernel support for Hermes 802.11b chipsets
-  KCONFIG:=$(CONFIG_HERMES)
-  SUBMENU:=$(WIMENU)
-  FILES:= \
-	$(MODULES_DIR)/kernel/drivers/net/wireless/hermes.$(LINUX_KMOD_SUFFIX) \
-	$(MODULES_DIR)/kernel/drivers/net/wireless/orinoco.$(LINUX_KMOD_SUFFIX)
-  AUTOLOAD:=$(call AutoLoad,50,hermes orinoco)
+define KernelPackage/net-zd1201
+  SUBMENU:=$(WIRELESS_MENU)
+  TITLE:=Zydas ZD1201 support
+  DEPENDS:=@USB_SUPPORT +@DRIVER_WEXT_SUPPORT
+  KCONFIG:=CONFIG_USB_ZD1201
+  FILES:=$(LINUX_DIR)/drivers/net/wireless/zd1201.ko
+  AUTOLOAD:=$(call AutoLoad,60,zd1201)
 endef
-$(eval $(call KernelPackage,net-hermes))
-
 
-define KernelPackage/net-hermes-pci
-  TITLE:=Intersil Prism 2.5 PCI support
-  DESCRIPTION:=Kernel modules for Intersil Prism 2.5 PCI support
-  KCONFIG:=$(CONFIG_PCI_HERMES)
-  DEPENDS:=kmod-net-hermes
-  SUBMENU:=$(WIMENU)
-  FILES:=$(MODULES_DIR)/kernel/drivers/net/wireless/orinoco_pci.$(LINUX_KMOD_SUFFIX)
-  AUTOLOAD:=$(call AutoLoad,55,orinoco_pci)
+define KernelPackage/net-zd1201/description
+ Kernel modules for Zydas ZD1201 support
+ Devices using this chip:
+   * Sweex LC100020
+   * Zyxel ZyAir B-220
+   * Peabird USB
+   * Gigafast WF741-UIC
+   * E-Tech Wireless USB Adapter
+   * DSE 802.11b USB wireless LAN adapter
+   * CC and C WLAN USB Adapter (WL 1202)
+   * Edimax EW-7117U
+   * X-Micro WLAN 11b USB Adapter
+   * Belkin F5D6051
+   * Topcom SKYR@CER WIRELESS USB STICK 11
+   * Surecom EP-9001
+   * JAHT WN-1011U
+   * BeWAN Wi-Fi USB 11
+   * NorthQ NQ9000
+   * MSI UB11B
+   * Origo WLL-1610
+   * Longshine LCS-8131R
+   * Gigabyte GN-WLBZ201
 endef
-$(eval $(call KernelPackage,net-hermes-pci))
 
+ZD1201FW_NAME:=zd1201
+ZD1201FW_VERSION:=0.14
+ZD1201FW_DIR:=$(ZD1201FW_NAME)-$(ZD1201FW_VERSION)-fw
+ZD1201FW_FILE:=$(ZD1201FW_DIR).tar.gz
 
-define KernelPackage/net-hermes-plx
-  TITLE:=PLX9052 based PCI adaptor
-  DESCRIPTION:=Kernel modules for Hermes in PLX9052 based PCI adaptors
-  KCONFIG:=$(CONFIG_PLX_HERMES)
-  DEPENDS:=kmod-net-hermes
-  SUBMENU:=$(WIMENU)
-  FILES:=$(MODULES_DIR)/kernel/drivers/net/wireless/orinoco_plx.$(LINUX_KMOD_SUFFIX)
-  AUTOLOAD:=$(call AutoLoad,55,orinoco_plx)
+define Download/net-zd1201
+  FILE:=$(ZD1201FW_FILE)
+  #http://downloads.sourceforge.net/project/linux-lc100020/%28NEW%29%20zd1201%20driver/zd1201.%20Version%200.14/zd1201-0.14-fw.tar.gz
+  URL:=@SF/linux-lc100020/\(NEW\)\ $(ZD1201FW_NAME)\ driver/$(ZD1201FW_NAME).\ Version\ $(ZD1201FW_VERSION)/
+  MD5SUM:=07a4febc365121f975e2c5e59791d55d
 endef
-$(eval $(call KernelPackage,net-hermes-plx))
+
+define KernelPackage/net-zd1201/install
+	$(INSTALL_DIR) $(1)/lib/firmware
+	$(TAR) -C $(1)/lib/firmware -zxf $(DL_DIR)/$(ZD1201FW_FILE) --strip-components=1 $(ZD1201FW_DIR)/$(ZD1201FW_NAME).fw $(ZD1201FW_DIR)/$(ZD1201FW_NAME)-ap.fw
+endef
+
+$(eval $(call Download,net-zd1201))
+$(eval $(call KernelPackage,net-zd1201))
 
 
 define KernelPackage/net-prism54
+  SUBMENU:=$(WIRELESS_MENU)
   TITLE:=Intersil Prism54 support
-  DESCRIPTION:=Kernel modules for Intersil Prism54 support
-  KCONFIG:=$(CONFIG_PRISM54)
-  SUBMENU:=$(WIMENU)
-  FILES:=$(MODULES_DIR)/kernel/drivers/net/wireless/prism54/prism54.$(LINUX_KMOD_SUFFIX)
+  DEPENDS:=@PCI_SUPPORT +@DRIVER_WEXT_SUPPORT
+  KCONFIG:=CONFIG_PRISM54
+  FILES:=$(LINUX_DIR)/drivers/net/wireless/prism54/prism54.ko
   AUTOLOAD:=$(call AutoLoad,60,prism54)
 endef
-$(eval $(call KernelPackage,net-prism54))
 
+define KernelPackage/net-prism54/description
+ Kernel modules for Intersil Prism54 support
+endef
+
+# Prism54 FullMAC firmware (jbnore.free.fr seems to be rather slow, so we use daemonizer.de)
+PRISM54_FW:=1.0.4.3.arm
 
-define KernelPackage/net-zd1211rw
-  TITLE:=Zydas ZD1211 support
-  DESCRIPTION:=Kernel modules Zydas ZD1211 support, kernel version
-  KCONFIG:=$(CONFIG_ZD1211RW)
-  DEPENDS:=kmod-ieee80211
-  SUBMENU:=$(WIMENU)
-  FILES:=$(MODULES_DIR)/kernel/drivers/net/wireless/zd1211rw/zdd1211rw.$(LINUX_KMOD_SUFFIX)
-  AUTOLOAD:=$(call AutoLoad,60,zd1211rw)
+define Download/net-prism54
+  FILE:=$(PRISM54_FW)
+  URL:=http://daemonizer.de/prism54/prism54-fw/fw-fullmac/
+  MD5SUM:=8bd4310971772a486b9784c77f8a6df9
 endef
+
+define KernelPackage/net-prism54/install
+	$(INSTALL_DIR) $(1)/lib/firmware
+	$(INSTALL_DATA) $(DL_DIR)/$(PRISM54_FW) $(1)/lib/firmware/isl3890
+endef
+
+$(eval $(call Download,net-prism54))
+$(eval $(call KernelPackage,net-prism54))
+