rtl8192su-firmware: move firmware to own package

Instead of downloading the firmware from some website take it from
linux-firmware package and do not download it separately any more.

Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>

diff --git a/package/firmware/linux-firmware/realtek.mk b/package/firmware/linux-firmware/realtek.mk
index 894915b2545f0a1b84abcd7c0e23c4a6f6564a7a..4229ca0ebbaa1fe55c3e30be5769c0cc492084d6 100644 (file)
--- a/package/firmware/linux-firmware/realtek.mk
+++ b/package/firmware/linux-firmware/realtek.mk
@@ -48,3 +48,10 @@ define Package/rtl8192se-firmware/install
        $(INSTALL_DATA) $(PKG_BUILD_DIR)/rtlwifi/rtl8192sefw.bin $(1)/lib/firmware/rtlwifi
 endef
 $(eval $(call BuildPackage,rtl8192se-firmware))
        $(INSTALL_DATA) $(PKG_BUILD_DIR)/rtlwifi/rtl8192sefw.bin $(1)/lib/firmware/rtlwifi
 endef
 $(eval $(call BuildPackage,rtl8192se-firmware))

+
+Package/rtl8192su-firmware = $(call Package/firmware-default,RealTek RTL8192SU firmware)
+define Package/rtl8192su-firmware/install
+       $(INSTALL_DIR) $(1)/lib/firmware/rtlwifi
+       $(INSTALL_DATA) $(PKG_BUILD_DIR)/rtlwifi/rtl8712u.bin $(1)/lib/firmware/rtlwifi
+endef
+$(eval $(call BuildPackage,rtl8192su-firmware))

diff --git a/package/kernel/linux/modules/wireless.mk b/package/kernel/linux/modules/wireless.mk
index b62827ec022e2831bdb238f8b86ba5d14c08d7a9..d7c4425c8c100208c6d4ba5684d4a3629da43ab1 100644 (file)
--- a/package/kernel/linux/modules/wireless.mk
+++ b/package/kernel/linux/modules/wireless.mk
@@ -43,7 +43,7 @@ $(eval $(call KernelPackage,net-prism54))
 define KernelPackage/net-rtl8192su
   SUBMENU:=$(WIRELESS_MENU)
   TITLE:=RTL8192SU support (staging)
 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
   KCONFIG:=\
        CONFIG_STAGING=y \
        CONFIG_R8712U


@@ -55,20 +55,4 @@ define KernelPackage/net-rtl8192su/description
  Kernel modules for RealTek RTL8712 and RTL81XXSU fullmac support.
 endef
 
  Kernel modules for RealTek RTL8712 and RTL81XXSU fullmac support.
 endef
 

-# R8712 FullMAC firmware
-R8712_FW:=rtl8712u.bin
-
-define Download/net-rtl8192su
-  FILE:=$(R8712_FW)
-
-  URL:=http://mirrors.arizona.edu/raspbmc/downloads/bin/lib/wifi/rtlwifi/
-  MD5SUM:=8e6396b5844a3e279ae8679555dec3f0
-endef
-
-define KernelPackage/net-rtl8192su/install
-       $(INSTALL_DIR) $(1)/lib/firmware/rtlwifi
-       $(INSTALL_DATA) $(DL_DIR)/$(R8712_FW) $(1)/lib/firmware/rtlwifi/
-endef
-
-$(eval $(call Download,net-rtl8192su))

 $(eval $(call KernelPackage,net-rtl8192su))
 $(eval $(call KernelPackage,net-rtl8192su))