kernel: move kmod-owl-loader to the right .mk file

[openwrt/staging/florian.git] / package / kernel / linux / modules / wireless.mk

diff --git a/package/kernel/linux/modules/wireless.mk b/package/kernel/linux/modules/wireless.mk
index 89b4bbb6ab8fd8c3a65f723f5920bf74e47ae2d3..7b1c6635674b6b9fc1de39a4e173bccdc13b3462 100644 (file)
--- a/package/kernel/linux/modules/wireless.mk
+++ b/package/kernel/linux/modules/wireless.mk
@@ -10,9 +10,11 @@ WIRELESS_MENU:=Wireless Drivers
 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
 
@@ -20,46 +22,13 @@ 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))
 
-define KernelPackage/net-rtl8188eu
-  SUBMENU:=$(WIRELESS_MENU)
-  TITLE:=RTL8188EU support (staging)
-  DEPENDS:=@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)
-endef
-
-define KernelPackage/net-rtl8188eu/description
- Kernel modules for RealTek RTL8188EU support
-endef
-
-$(eval $(call KernelPackage,net-rtl8188eu))
 
 define KernelPackage/net-rtl8192su
   SUBMENU:=$(WIRELESS_MENU)
   TITLE:=RTL8192SU support (staging)
-  DEPENDS:=@USB_SUPPORT +@DRIVER_WEXT_SUPPORT +kmod-usb-core
+  DEPENDS:=@USB_SUPPORT +@DRIVER_WEXT_SUPPORT +kmod-usb-core +rtl8192su-firmware
   KCONFIG:=\
        CONFIG_STAGING=y \
        CONFIG_R8712U
@@ -71,20 +40,25 @@ define KernelPackage/net-rtl8192su/description
  Kernel modules for RealTek RTL8712 and RTL81XXSU fullmac support.
 endef
 
-# R8712 FullMAC firmware
-R8712_FW:=rtl8712u.bin
+$(eval $(call KernelPackage,net-rtl8192su))
 
-define Download/net-rtl8192su
-  FILE:=$(R8712_FW)
 
-  URL:=http://mirrors.arizona.edu/raspbmc/downloads/bin/lib/wifi/rtlwifi/
-  MD5SUM:=8e6396b5844a3e279ae8679555dec3f0
+define KernelPackage/owl-loader
+  SUBMENU:=$(WIRELESS_MENU)
+  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-rtl8192su/install
-       $(INSTALL_DIR) $(1)/lib/firmware/rtlwifi
-       $(INSTALL_DATA) $(DL_DIR)/$(R8712_FW) $(1)/lib/firmware/rtlwifi/
+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.
+
+  This is necessary for devices like the Cisco Meraki Z1.
 endef
 
-$(eval $(call Download,net-rtl8192su))
-$(eval $(call KernelPackage,net-rtl8192su))
+$(eval $(call KernelPackage,owl-loader))