From: Felix Fietkau Date: Sun, 10 Jan 2016 16:36:17 +0000 (+0000) Subject: mac80211: move marvell firmware to the linux-firmware package X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=6d0d89dc65d03f7a960a2cf0f774ab538723d212;p=openwrt%2Fstaging%2Frmilecki.git mac80211: move marvell firmware to the linux-firmware package Signed-off-by: Felix Fietkau SVN-Revision: 48178 --- diff --git a/package/firmware/linux-firmware/Makefile b/package/firmware/linux-firmware/Makefile index d268979d447..7dc2b78d380 100644 --- a/package/firmware/linux-firmware/Makefile +++ b/package/firmware/linux-firmware/Makefile @@ -21,6 +21,8 @@ PKG_MIRROR_MD5SUM:=ca4d289ad9380471cae376fc7dd3660a PKG_MAINTAINER:=Felix Fietkau +SCAN_DEPS = *.mk + include $(INCLUDE_DIR)/package.mk define Package/firmware-default diff --git a/package/firmware/linux-firmware/marvell.mk b/package/firmware/linux-firmware/marvell.mk new file mode 100644 index 00000000000..86c0e6fede0 --- /dev/null +++ b/package/firmware/linux-firmware/marvell.mk @@ -0,0 +1,46 @@ +Package/mwl8k-firmware = $(call Package/firmware-default,Marvell 8366/8687 firmware) +define Package/mwl8k-firmware/install + $(INSTALL_DIR) $(1)/lib/firmware/mwl8k + $(INSTALL_DATA) \ + $(PKG_BUILD_DIR)/mwl8k/fmimage_8366_ap-3.fw \ + $(PKG_BUILD_DIR)/mwl8k/fmimage_8366.fw \ + $(PKG_BUILD_DIR)/mwl8k/helper_8366.fw \ + $(PKG_BUILD_DIR)/mwl8k/fmimage_8687.fw \ + $(PKG_BUILD_DIR)/mwl8k/helper_8687.fw \ + $(1)/lib/firmware/mwl8k/ +endef +$(eval $(call BuildPackage,mwl8k-firmware)) + +Package/mwifiex-pcie-firmware = $(call Package/firmware-default,Marvell 8897 firmware) +define Package/mwifiex-pcie-firmware/install + $(INSTALL_DIR) $(1)/lib/firmware/mrvl + $(INSTALL_DATA) \ + $(PKG_BUILD_DIR)/mrvl/pcie8897_uapsta.bin \ + $(1)/lib/firmware/mrvl/ +endef +$(eval $(call BuildPackage,mwifiex-pcie-firmware)) + +Package/libertas-usb-firmware = $(call Package/firmware-default,Marvell 8388/8682 USB firmware) +define Package/libertas-usb-firmware/install + $(INSTALL_DIR) $(1)/lib/firmware/libertas + $(INSTALL_DATA) \ + $(PKG_BUILD_DIR)/libertas/usb8388_v9.bin \ + $(PKG_BUILD_DIR)/libertas/usb8682.bin \ + $(1)/lib/firmware/libertas/ +endef +$(eval $(call BuildPackage,libertas-usb-firmware)) + +Package/libertas-sdio-firmware = $(call Package/firmware-default,Marvell 8385/8686/8688 SDIO firmware) +define Package/libertas-sdio-firmware/install + $(INSTALL_DIR) $(1)/lib/firmware/libertas + $(INSTALL_DATA) \ + $(PKG_BUILD_DIR)/libertas/sd8385_helper.bin \ + $(PKG_BUILD_DIR)/libertas/sd8385.bin \ + $(PKG_BUILD_DIR)/libertas/sd8686_v9_helper.bin \ + $(PKG_BUILD_DIR)/libertas/sd8686_v9.bin \ + $(PKG_BUILD_DIR)/libertas/sd8688_helper.bin \ + $(PKG_BUILD_DIR)/libertas/sd8688.bin \ + $(1)/lib/firmware/libertas +endef +$(eval $(call BuildPackage,libertas-sdio-firmware)) + diff --git a/package/kernel/mac80211/Makefile b/package/kernel/mac80211/Makefile index 5429e75c109..c626ef56083 100644 --- a/package/kernel/mac80211/Makefile +++ b/package/kernel/mac80211/Makefile @@ -1017,7 +1017,7 @@ endef define KernelPackage/libertas-usb $(call KernelPackage/mac80211/Default) - DEPENDS+= @USB_SUPPORT +kmod-cfg80211 +kmod-usb-core +kmod-lib80211 +@DRIVER_WEXT_SUPPORT + DEPENDS+= @USB_SUPPORT +kmod-cfg80211 +kmod-usb-core +kmod-lib80211 +@DRIVER_WEXT_SUPPORT +libertas-usb-firmware TITLE:=Marvell 88W8015 Wireless Driver FILES:= \ $(PKG_BUILD_DIR)/drivers/net/wireless/marvell/libertas/libertas.ko \ @@ -1027,7 +1027,7 @@ endef define KernelPackage/libertas-sdio $(call KernelPackage/mac80211/Default) - DEPENDS+= +kmod-cfg80211 +kmod-lib80211 +kmod-mmc +@DRIVER_WEXT_SUPPORT @!TARGET_uml + DEPENDS+= +kmod-cfg80211 +kmod-lib80211 +kmod-mmc +@DRIVER_WEXT_SUPPORT @!TARGET_uml +libertas-sdio-firmware TITLE:=Marvell 88W8686 Wireless Driver FILES:= \ $(PKG_BUILD_DIR)/drivers/net/wireless/marvell/libertas/libertas.ko \ @@ -1057,7 +1057,7 @@ define KernelPackage/mwl8k $(call KernelPackage/mac80211/Default) TITLE:=Driver for Marvell TOPDOG 802.11 Wireless cards URL:=http://wireless.kernel.org/en/users/Drivers/mwl8k - DEPENDS+= @PCI_SUPPORT +kmod-mac80211 +@DRIVER_11N_SUPPORT + DEPENDS+= @PCI_SUPPORT +kmod-mac80211 +@DRIVER_11N_SUPPORT +mwl8k-firmware FILES:=$(PKG_BUILD_DIR)/drivers/net/wireless/marvell/mwl8k.ko AUTOLOAD:=$(call AutoProbe,mwl8k) endef @@ -1071,7 +1071,7 @@ define KernelPackage/mwifiex-pcie $(call KernelPackage/mac80211/Default) TITLE:=Driver for Marvell 802.11n/802.11ac PCIe Wireless cards URL:=http://wireless.kernel.org/en/users/Drivers/mwifiex - DEPENDS+= @PCI_SUPPORT +kmod-mac80211 +@DRIVER_11N_SUPPORT + DEPENDS+= @PCI_SUPPORT +kmod-mac80211 +@DRIVER_11N_SUPPORT +mwifiex-pcie-firmware FILES:= \ $(PKG_BUILD_DIR)/drivers/net/wireless/marvell/mwifiex/mwifiex.ko \ $(PKG_BUILD_DIR)/drivers/net/wireless/marvell/mwifiex/mwifiex_pcie.ko @@ -1839,26 +1839,6 @@ define KernelPackage/ipw2200/install $(INSTALL_DATA) $(PKG_BUILD_DIR)/$(IPW2200_NAME)-$(IPW2200_VERSION)/ipw2200*.fw $(1)/lib/firmware endef -define KernelPackage/libertas-usb/install - $(INSTALL_DIR) $(1)/lib/firmware/libertas - $(INSTALL_DATA) \ - $(PKG_BUILD_DIR)/$(PKG_LINUX_FIRMWARE_SUBDIR)/libertas/usb8388_v9.bin \ - $(PKG_BUILD_DIR)/$(PKG_LINUX_FIRMWARE_SUBDIR)/libertas/usb8682.bin \ - $(1)/lib/firmware/libertas/ -endef - -define KernelPackage/libertas-sdio/install - $(INSTALL_DIR) $(1)/lib/firmware/libertas - $(INSTALL_DATA) \ - $(PKG_BUILD_DIR)/$(PKG_LINUX_FIRMWARE_SUBDIR)/libertas/sd8385_helper.bin \ - $(PKG_BUILD_DIR)/$(PKG_LINUX_FIRMWARE_SUBDIR)/libertas/sd8385.bin \ - $(PKG_BUILD_DIR)/$(PKG_LINUX_FIRMWARE_SUBDIR)/libertas/sd8686_v9_helper.bin \ - $(PKG_BUILD_DIR)/$(PKG_LINUX_FIRMWARE_SUBDIR)/libertas/sd8686_v9.bin \ - $(PKG_BUILD_DIR)/$(PKG_LINUX_FIRMWARE_SUBDIR)/libertas/sd8688_helper.bin \ - $(PKG_BUILD_DIR)/$(PKG_LINUX_FIRMWARE_SUBDIR)/libertas/sd8688.bin \ - $(1)/lib/firmware/libertas -endef - define KernelPackage/mt7601u/install $(INSTALL_DIR) $(1)/lib/firmware $(INSTALL_DATA) \ @@ -1866,24 +1846,6 @@ define KernelPackage/mt7601u/install $(1)/lib/firmware endef -define KernelPackage/mwl8k/install - $(INSTALL_DIR) $(1)/lib/firmware/mwl8k - $(INSTALL_DATA) \ - $(PKG_BUILD_DIR)/$(PKG_LINUX_FIRMWARE_SUBDIR)/mwl8k/fmimage_8366_ap-3.fw \ - $(PKG_BUILD_DIR)/$(PKG_LINUX_FIRMWARE_SUBDIR)/mwl8k/fmimage_8366.fw \ - $(PKG_BUILD_DIR)/$(PKG_LINUX_FIRMWARE_SUBDIR)/mwl8k/helper_8366.fw \ - $(PKG_BUILD_DIR)/$(PKG_LINUX_FIRMWARE_SUBDIR)/mwl8k/fmimage_8687.fw \ - $(PKG_BUILD_DIR)/$(PKG_LINUX_FIRMWARE_SUBDIR)/mwl8k/helper_8687.fw \ - $(1)/lib/firmware/mwl8k/ -endef - -define KernelPackage/mwifiex-pcie/install - $(INSTALL_DIR) $(1)/lib/firmware/mrvl - $(INSTALL_DATA) \ - $(PKG_BUILD_DIR)/$(PKG_LINUX_FIRMWARE_SUBDIR)/mrvl/pcie8897_uapsta.bin \ - $(1)/lib/firmware/mrvl/ -endef - define KernelPackage/p54-pci/install $(INSTALL_DIR) $(1)/lib/firmware $(INSTALL_DATA) $(DL_DIR)/$(P54PCIFW) $(1)/lib/firmware/isl3886pci