X-Git-Url: http://git.openwrt.org/?a=blobdiff_plain;f=package%2Fkernel%2Flinux%2Fmodules%2Fwireless.mk;h=7b1c6635674b6b9fc1de39a4e173bccdc13b3462;hb=b81b18b5a46204f0b6539ee68c5ae7c1493668b3;hp=245902b09b9827c404de24ebc069da0a8a309503;hpb=7996f0b3135b1469823a15489d1a86804915ee5c;p=openwrt%2Fstaging%2Fmkresin.git

diff --git a/package/kernel/linux/modules/wireless.mk b/package/kernel/linux/modules/wireless.mk
index 245902b09b..7b1c663567 100644
--- a/package/kernel/linux/modules/wireless.mk
+++ b/package/kernel/linux/modules/wireless.mk
@@ -7,82 +7,14 @@
 
 WIRELESS_MENU:=Wireless Drivers
 
-define KernelPackage/net-airo
-  SUBMENU:=$(WIRELESS_MENU)
-  TITLE:=Cisco Aironet driver
-  DEPENDS:=@PCI_SUPPORT +@DRIVER_WEXT_SUPPORT
-  KCONFIG:=CONFIG_AIRO
-  FILES:=$(LINUX_DIR)/drivers/net/wireless/airo.ko
-  AUTOLOAD:=$(call AutoProbe,airo)
-endef
-
-define KernelPackage/net-airo/description
- Kernel support for Cisco Aironet cards
-endef
-
-$(eval $(call KernelPackage,net-airo))
-
-
-define KernelPackage/net-zd1201
-  SUBMENU:=$(WIRELESS_MENU)
-  TITLE:=Zydas ZD1201 support
-  DEPENDS:=@USB_SUPPORT +@DRIVER_WEXT_SUPPORT +kmod-usb-core
-  KCONFIG:=CONFIG_USB_ZD1201
-  FILES:=$(LINUX_DIR)/drivers/net/wireless/zd1201.ko
-  AUTOLOAD:=$(call AutoProbe,zd1201)
-endef
-
-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
-
-ZD1201FW_NAME:=zd1201
-ZD1201FW_VERSION:=0.14
-ZD1201FW_DIR:=$(ZD1201FW_NAME)-$(ZD1201FW_VERSION)-fw
-ZD1201FW_FILE:=$(ZD1201FW_DIR).tar.gz
-
-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/%28NEW%29%20$(ZD1201FW_NAME)%20driver/$(ZD1201FW_NAME).%20Version%20$(ZD1201FW_VERSION)/
-  MD5SUM:=07a4febc365121f975e2c5e59791d55d
-endef
-
-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
-  DEPENDS:=@PCI_SUPPORT +@DRIVER_WEXT_SUPPORT
+  DEPENDS:=@PCI_SUPPORT +@DRIVER_WEXT_SUPPORT +prism54-firmware
   KCONFIG:=CONFIG_PRISM54
-  FILES:=$(LINUX_DIR)/drivers/net/wireless/prism54/prism54.ko
+  FILES:= \
+	$(LINUX_DIR)/drivers/net/wireless/prism54/prism54.ko@lt4.5 \
+	$(LINUX_DIR)/drivers/net/wireless/intersil/prism54/prism54.ko@ge4.5
   AUTOLOAD:=$(call AutoProbe,prism54)
 endef
 
@@ -90,39 +22,43 @@ 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
+$(eval $(call KernelPackage,net-prism54))
+
 
-define Download/net-prism54
-  FILE:=$(PRISM54_FW)
-  URL:=http://daemonizer.de/prism54/prism54-fw/fw-fullmac/
-  MD5SUM:=8bd4310971772a486b9784c77f8a6df9
+define KernelPackage/net-rtl8192su
+  SUBMENU:=$(WIRELESS_MENU)
+  TITLE:=RTL8192SU support (staging)
+  DEPENDS:=@USB_SUPPORT +@DRIVER_WEXT_SUPPORT +kmod-usb-core +rtl8192su-firmware
+  KCONFIG:=\
+	CONFIG_STAGING=y \
+	CONFIG_R8712U
+  FILES:=$(LINUX_DIR)/drivers/staging/rtl8712/r8712u.ko
+  AUTOLOAD:=$(call AutoProbe,r8712u)
 endef
 
-define KernelPackage/net-prism54/install
-	$(INSTALL_DIR) $(1)/lib/firmware
-	$(INSTALL_DATA) $(DL_DIR)/$(PRISM54_FW) $(1)/lib/firmware/isl3890
+define KernelPackage/net-rtl8192su/description
+ Kernel modules for RealTek RTL8712 and RTL81XXSU fullmac support.
 endef
 
-$(eval $(call Download,net-prism54))
-$(eval $(call KernelPackage,net-prism54))
+$(eval $(call KernelPackage,net-rtl8192su))
 
-define KernelPackage/net-rtl8188eu
+
+define KernelPackage/owl-loader
   SUBMENU:=$(WIRELESS_MENU)
-  TITLE:=RTL8188EU support (staging)
-  DEPENDS:=@!LINUX_3_3 @!LINUX_3_8 @!LINUX_3_10 @USB_SUPPORT +@DRIVER_WEXT_SUPPORT +r8188eu-firmware +kmod-usb-core
-  KCONFIG:=\
-	CONFIG_STAGING=y \
-	CONFIG_R8188EU \
-	CONFIG_88EU_AP_MODE=y \
-	CONFIG_88EU_P2P=n
-  FILES:=$(LINUX_DIR)/drivers/staging/rtl8188eu/r8188eu.ko
-  AUTOLOAD:=$(call AutoProbe,r8188eu)
+  TITLE:=Owl loader for initializing Atheros PCI(e) Wifi chips
+  DEPENDS:=@PCI_SUPPORT
+  KCONFIG:=CONFIG_OWL_LOADER
+  FILES:=$(LINUX_DIR)/drivers/misc/owl-loader.ko
+  AUTOLOAD:=$(call AutoProbe,owl-loader)
 endef
 
-define KernelPackage/net-rtl8188eu/description
- Kernel modules for RealTek RTL8188EU support
-endef
+define KernelPackage/owl-loader/description
+  Kernel module that helps to initialize certain Qualcomm
+  Atheros' PCI(e) Wifi chips, which have the init data
+  (which contains the PCI device ID for example) stored
+  together with the calibration data in the file system.
 
-$(eval $(call KernelPackage,net-rtl8188eu))
+  This is necessary for devices like the Cisco Meraki Z1.
+endef
 
+$(eval $(call KernelPackage,owl-loader))