X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/83790f74ad846ab2a50c71fab34a2d7755df4a95..e20ce563646f920c27bc8c56ee217d8b7e5e9641:/package/kernel/modules/wireless.mk

diff --git a/package/kernel/modules/wireless.mk b/package/kernel/modules/wireless.mk
index f4c1686c4..f0dd3b8e3 100644
--- a/package/kernel/modules/wireless.mk
+++ b/package/kernel/modules/wireless.mk
@@ -1,160 +1,153 @@
-# 
-# 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:= \
-  	$(LINUX_DIR)/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:= \
-	$(LINUX_DIR)/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:=$(LINUX_DIR)/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:=$(LINUX_DIR)/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:=$(LINUX_DIR)/drivers/net/wireless/ipw2200.$(LINUX_KMOD_SUFFIX)
-  AUTOLOAD:=$(call AutoLoad,50,ipw2200)
-  SUBMENU:=$(WIMENU)
-endef
-$(eval $(call KernelPackage,net-ipw2200))
+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,lib80211))
 
 define KernelPackage/net-airo
+  SUBMENU:=$(WIRELESS_MENU)
   TITLE:=Cisco Aironet driver
-  DESCRIPTION:=Driver for Cisco Aironet cards
-  KCONFIG:=$(CONFIG_AIRO)
-  SUBMENU:=$(WIMENU)
-  FILES:=$(LINUX_DIR)/drivers/net/wireless/airo.$(LINUX_KMOD_SUFFIX)
+  DEPENDS:=@PCI_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
+  SUBMENU:=$(WIRELESS_MENU)
   TITLE:=Hermes 802.11b chipset support
-  DESCRIPTION:=Kernel support for Hermes 802.11b chipsets
-  KCONFIG:=$(CONFIG_HERMES)
-  SUBMENU:=$(WIMENU)
+  DEPENDS:=@PCI_SUPPORT||PCMCIA_SUPPORT
+  KCONFIG:=CONFIG_HERMES \
+	CONFIG_HERMES_CACHE_FW_ON_INIT=n
   FILES:= \
-	$(LINUX_DIR)/drivers/net/wireless/hermes.$(LINUX_KMOD_SUFFIX) \
-	$(LINUX_DIR)/drivers/net/wireless/orinoco.$(LINUX_KMOD_SUFFIX)
-  AUTOLOAD:=$(call AutoLoad,50,hermes orinoco)
+	$(LINUX_DIR)/drivers/net/wireless/orinoco/orinoco.ko
+  AUTOLOAD:=$(call AutoLoad,50,orinoco)
 endef
+
+define KernelPackage/net-hermes/description
+ Kernel support for Hermes 802.11b chipsets
+endef
+
 $(eval $(call KernelPackage,net-hermes))
 
 
 define KernelPackage/net-hermes-pci
+  SUBMENU:=$(WIRELESS_MENU)
   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:=$(LINUX_DIR)/drivers/net/wireless/orinoco_pci.$(LINUX_KMOD_SUFFIX)
+  DEPENDS:=@PCI_SUPPORT +kmod-net-hermes
+  KCONFIG:=CONFIG_PCI_HERMES
+  FILES:=$(LINUX_DIR)/drivers/net/wireless/orinoco/orinoco_pci.ko
   AUTOLOAD:=$(call AutoLoad,55,orinoco_pci)
 endef
+
+define KernelPackage/net-hermes-pci/description
+ Kernel modules for Intersil Prism 2.5 PCI support
+endef
+
 $(eval $(call KernelPackage,net-hermes-pci))
 
 
 define KernelPackage/net-hermes-plx
+  SUBMENU:=$(WIRELESS_MENU)
   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:=$(LINUX_DIR)/drivers/net/wireless/orinoco_plx.$(LINUX_KMOD_SUFFIX)
+  DEPENDS:=@PCI_SUPPORT +kmod-net-hermes
+  KCONFIG:=CONFIG_PLX_HERMES
+  FILES:=$(LINUX_DIR)/drivers/net/wireless/orinoco/orinoco_plx.ko
   AUTOLOAD:=$(call AutoLoad,55,orinoco_plx)
 endef
+
+define KernelPackage/net-hermes-plx/description
+ Kernel modules for Hermes in PLX9052 based PCI adaptors
+endef
+
 $(eval $(call KernelPackage,net-hermes-plx))
 
 
+define KernelPackage/net-hermes-pcmcia
+  SUBMENU:=$(WIRELESS_MENU)
+  TITLE:=Hermes based PCMCIA adaptors
+  DEPENDS:=@PCMCIA_SUPPORT +kmod-net-hermes
+  KCONFIG:=CONFIG_PCMCIA_HERMES
+  FILES:=$(LINUX_DIR)/drivers/net/wireless/orinoco/orinoco_cs.ko
+  AUTOLOAD:=$(call AutoLoad,55,orinoco_cs)
+endef
+
+define KernelPackage/net-hermes-pcmcia/description
+ Kernel modules for Hermes based PCMCIA adaptors
+endef
+
+$(eval $(call KernelPackage,net-hermes-pcmcia))
+
+
 define KernelPackage/net-prism54
+  SUBMENU:=$(WIRELESS_MENU)
   TITLE:=Intersil Prism54 support
-  DESCRIPTION:=Kernel modules for Intersil Prism54 support
-  KCONFIG:=$(CONFIG_PRISM54)
-  SUBMENU:=$(WIMENU)
-  FILES:=$(LINUX_DIR)/drivers/net/wireless/prism54/prism54.$(LINUX_KMOD_SUFFIX)
+  DEPENDS:=@PCI_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 Download/net-prism54
+  FILE:=$(PRISM54_FW)
+  URL:=http://daemonizer.de/prism54/prism54-fw/fw-fullmac/
+  MD5SUM:=8bd4310971772a486b9784c77f8a6df9
+endef
 
-define KernelPackage/net-zd1211rw
-  TITLE:=Zydas ZD1211 support
-  DESCRIPTION:=Kernel modules Zydas ZD1211 support, kernel version
-  KCONFIG:=$(CONFIG_ZD1211RW)
-  DEPENDS:=+kmod-ieee80211 @LINUX_2_6
-  SUBMENU:=$(WIMENU)
-  FILES:=$(LINUX_DIR)/drivers/net/wireless/zd1211rw/zd1211rw.$(LINUX_KMOD_SUFFIX)
-  AUTOLOAD:=$(call AutoLoad,60,zd1211rw)
+define KernelPackage/net-prism54/install
+	$(INSTALL_DIR) $(1)/lib/firmware
+	$(INSTALL_DATA) $(DL_DIR)/$(PRISM54_FW) $(1)/lib/firmware/isl3890
 endef
-$(eval $(call KernelPackage,net-zd1211rw))
+
+$(eval $(call Download,net-prism54))
+$(eval $(call KernelPackage,net-prism54))
+