X-Git-Url: http://git.rohieb.name/openwrt.git/blobdiff_plain/05e0a5538071fd269c14983ab4ba807f375df4a2..554c407f4b80b1389429652e0327465945744098:/package/kernel/modules/wireless.mk diff --git a/package/kernel/modules/wireless.mk b/package/kernel/modules/wireless.mk index f83bb723c..95bab55a2 100644 --- a/package/kernel/modules/wireless.mk +++ b/package/kernel/modules/wireless.mk @@ -4,89 +4,65 @@ # This is free software, licensed under the GNU General Public License v2. # See /LICENSE for more information. # -# $Id$ WIRELESS_MENU:=Wireless Drivers -# NOTE: dependency on 2.6 was removed since it was inherited by kmod-hostap -# and prevented it from even showing up in menuconfig on 2.4 -define KernelPackage/ieee80211 +define KernelPackage/lib80211 SUBMENU:=$(WIRELESS_MENU) TITLE:=802.11 Networking stack - DEPENDS:=+kmod-crypto-arc4 +kmod-crypto-aes +kmod-crypto-michael-mic + DEPENDS:=@!LINUX_2_4 KCONFIG:= \ - CONFIG_IEEE80211 \ - CONFIG_IEEE80211_CRYPT_WEP \ - CONFIG_IEEE80211_CRYPT_CCMP \ - CONFIG_IEEE80211_CRYPT_TKIP + CONFIG_LIB80211 \ + CONFIG_LIB80211_CRYPT_WEP \ + CONFIG_LIB80211_CRYPT_TKIP \ + CONFIG_LIB80211_CRYPT_CCMP FILES:= \ - $(LINUX_DIR)/net/ieee80211/ieee80211_crypt.$(LINUX_KMOD_SUFFIX) \ - $(LINUX_DIR)/net/ieee80211/ieee80211.$(LINUX_KMOD_SUFFIX) \ - $(LINUX_DIR)/net/ieee80211/ieee80211_crypt_wep.$(LINUX_KMOD_SUFFIX) \ - $(LINUX_DIR)/net/ieee80211/ieee80211_crypt_tkip.$(LINUX_KMOD_SUFFIX) \ - $(LINUX_DIR)/net/ieee80211/ieee80211_crypt_ccmp.$(LINUX_KMOD_SUFFIX) + $(LINUX_DIR)/net/wireless/lib80211.$(LINUX_KMOD_SUFFIX) \ + $(LINUX_DIR)/net/wireless/lib80211_crypt_wep.$(LINUX_KMOD_SUFFIX) \ + $(LINUX_DIR)/net/wireless/lib80211_crypt_ccmp.$(LINUX_KMOD_SUFFIX) \ + $(LINUX_DIR)/net/wireless/lib80211_crypt_tkip.$(LINUX_KMOD_SUFFIX) 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 \ ) endef -define KernelPackage/ieee80211/description +define KernelPackage/lib80211/description Kernel modules for 802.11 Networking stack Includes: - - ieee80211_crypt - - ieee80211 - - ieee80211_crypt_wep - - ieee80211_crypt_tkip - - ieee80211_crytp_ccmp + - lib80211 + - lib80211_crypt_wep + - lib80211_crypt_tkip + - lib80211_crytp_ccmp endef -$(eval $(call KernelPackage,ieee80211)) +$(eval $(call KernelPackage,lib80211)) -define KernelPackage/ieee80211-softmac +define KernelPackage/net-libipw SUBMENU:=$(WIRELESS_MENU) - TITLE:=ieee80211 SoftMAC support - DEPENDS:=+kmod-ieee80211 - KCONFIG:=CONFIG_IEEE80211_SOFTMAC - FILES:=$(LINUX_DIR)/net/ieee80211/softmac/ieee80211softmac.$(LINUX_KMOD_SUFFIX) - AUTOLOAD:=$(call AutoLoad,20,ieee80211softmac) + TITLE:=libipw for ipw2100 and ipw2200 + DEPENDS:=@PCI_SUPPORT +kmod-crypto-core +kmod-crypto-arc4 +kmod-crypto-aes +kmod-crypto-michael-mic +kmod-lib80211 + KCONFIG:=CONFIG_LIBIPW + FILES:=$(LINUX_DIR)/drivers/net/wireless/ipw2x00/libipw.$(LINUX_KMOD_SUFFIX) + AUTOLOAD:=$(call AutoLoad,49,libipw) endef -define KernelPackage/ieee80211-softmac/description - Kernel modules for 802.11 SoftMAC support +define KernelPackage/net-libipw/description + Hardware independent IEEE 802.11 networking stack for ipw2100 and ipw2200. endef -$(eval $(call KernelPackage,ieee80211-softmac)) - - -define KernelPackage/net-bcm43xx - SUBMENU:=$(WIRELESS_MENU) - TITLE:=Broadcom BCM43xx driver - DEPENDS:=@TARGET_brcm47xx||TARGET_brcm63xx +kmod-ieee80211-softmac - KCONFIG:=CONFIG_BCM43XX - FILES:=$(LINUX_DIR)/drivers/net/wireless/bcm43xx/bcm43xx.$(LINUX_KMOD_SUFFIX) - AUTOLOAD:=$(call AutoLoad,50,bcm43xx) -endef - -define KernelPackage/net-bcm43xx/description - Kernel support for Broadcom BCM43xx - Includes: - - bcm43xx -endef - -$(eval $(call KernelPackage,net-bcm43xx)) +$(eval $(call KernelPackage,net-libipw)) define KernelPackage/net-ipw2100 SUBMENU:=$(WIRELESS_MENU) TITLE:=Intel IPW2100 driver - DEPENDS:=@PCI_SUPPORT +kmod-ieee80211 + DEPENDS:=@PCI_SUPPORT +kmod-net-libipw KCONFIG:=CONFIG_IPW2100 - FILES:=$(LINUX_DIR)/drivers/net/wireless/ipw2100.$(LINUX_KMOD_SUFFIX) + FILES:=$(LINUX_DIR)/drivers/net/wireless/ipw2x00/ipw2100.$(LINUX_KMOD_SUFFIX) AUTOLOAD:=$(call AutoLoad,50,ipw2100) endef @@ -102,9 +78,9 @@ $(eval $(call KernelPackage,net-ipw2100)) define KernelPackage/net-ipw2200 SUBMENU:=$(WIRELESS_MENU) TITLE:=Intel IPW2200 driver - DEPENDS:=@PCI_SUPPORT +kmod-ieee80211 + DEPENDS:=@PCI_SUPPORT +kmod-net-libipw KCONFIG:=CONFIG_IPW2200 - FILES:=$(LINUX_DIR)/drivers/net/wireless/ipw2200.$(LINUX_KMOD_SUFFIX) + FILES:=$(LINUX_DIR)/drivers/net/wireless/ipw2x00/ipw2200.$(LINUX_KMOD_SUFFIX) AUTOLOAD:=$(call AutoLoad,50,ipw2200) endef @@ -137,11 +113,11 @@ define KernelPackage/net-hermes SUBMENU:=$(WIRELESS_MENU) TITLE:=Hermes 802.11b chipset support DEPENDS:=@LINUX_2_6 @PCI_SUPPORT||PCMCIA_SUPPORT - KCONFIG:=CONFIG_HERMES + 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.$(LINUX_KMOD_SUFFIX) + AUTOLOAD:=$(call AutoLoad,50,orinoco) endef define KernelPackage/net-hermes/description @@ -154,9 +130,9 @@ $(eval $(call KernelPackage,net-hermes)) define KernelPackage/net-hermes-pci SUBMENU:=$(WIRELESS_MENU) TITLE:=Intersil Prism 2.5 PCI support - DEPENDS:=@PCI_SUPPORT kmod-net-hermes + DEPENDS:=@PCI_SUPPORT +kmod-net-hermes KCONFIG:=CONFIG_PCI_HERMES - FILES:=$(LINUX_DIR)/drivers/net/wireless/orinoco_pci.$(LINUX_KMOD_SUFFIX) + FILES:=$(LINUX_DIR)/drivers/net/wireless/orinoco/orinoco_pci.$(LINUX_KMOD_SUFFIX) AUTOLOAD:=$(call AutoLoad,55,orinoco_pci) endef @@ -170,9 +146,9 @@ $(eval $(call KernelPackage,net-hermes-pci)) define KernelPackage/net-hermes-plx SUBMENU:=$(WIRELESS_MENU) TITLE:=PLX9052 based PCI adaptor - DEPENDS:=@PCI_SUPPORT kmod-net-hermes + DEPENDS:=@PCI_SUPPORT +kmod-net-hermes KCONFIG:=CONFIG_PLX_HERMES - FILES:=$(LINUX_DIR)/drivers/net/wireless/orinoco_plx.$(LINUX_KMOD_SUFFIX) + FILES:=$(LINUX_DIR)/drivers/net/wireless/orinoco/orinoco_plx.$(LINUX_KMOD_SUFFIX) AUTOLOAD:=$(call AutoLoad,55,orinoco_plx) endef @@ -196,5 +172,20 @@ 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-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))