diff options
| author | Felix Fietkau <nbd@openwrt.org> | 2016-01-10 16:36:48 +0000 |
|---|---|---|
| committer | Felix Fietkau <nbd@openwrt.org> | 2016-01-10 16:36:48 +0000 |
| commit | 26eb79358909496773aa7603f1d8dff34c9687dc (patch) | |
| tree | 0450899897ae0f0e1ca2eebca33bdd3db1061e65 | |
| parent | 4a791c8d4edbb9b70940c052e760a036edf0e58c (diff) | |
| download | master-31e0f0ae-26eb79358909496773aa7603f1d8dff34c9687dc.tar.gz master-31e0f0ae-26eb79358909496773aa7603f1d8dff34c9687dc.tar.bz2 master-31e0f0ae-26eb79358909496773aa7603f1d8dff34c9687dc.zip | |
mac80211: move broadcom firmware to the linux-firmware package
Signed-off-by: Felix Fietkau <nbd@openwrt.org>
SVN-Revision: 48182
| -rw-r--r-- | package/firmware/linux-firmware/broadcom.mk | 42 | ||||
| -rw-r--r-- | package/kernel/mac80211/Makefile | 37 |
2 files changed, 47 insertions, 32 deletions
diff --git a/package/firmware/linux-firmware/broadcom.mk b/package/firmware/linux-firmware/broadcom.mk new file mode 100644 index 0000000000..807ffa0fb0 --- /dev/null +++ b/package/firmware/linux-firmware/broadcom.mk @@ -0,0 +1,42 @@ +Package/brcmfmac-firmware-pcie = $(call Package/firmware-default,Broadcom BCM43xx fullmac PCIe firmware) +define Package/brcmfmac-firmware-pcie/install + $(INSTALL_DIR) $(1)/lib/firmware/brcm + $(INSTALL_DATA) \ + $(PKG_BUILD_DIR)/brcm/brcmfmac43602-pcie.ap.bin \ + $(1)/lib/firmware/brcm/brcmfmac43602-pcie.bin +endef +$(eval $(call BuildPackage,brcmfmac-firmware-pcie)) + +Package/brcmfmac-firmware-sdio = $(call Package/firmware-default,Broadcom BCM43xx fullmac SDIO firmware) +define Package/brcmfmac-firmware-sdio/install + $(INSTALL_DIR) $(1)/lib/firmware/brcm + $(INSTALL_DATA) \ + $(PKG_BUILD_DIR)/brcm/brcmfmac4329-sdio.bin \ + $(1)/lib/firmware/brcm/brcmfmac4329-sdio.bin + $(INSTALL_DATA) \ + $(PKG_BUILD_DIR)/brcm/brcmfmac43362-sdio.bin \ + $(1)/lib/firmware/brcm/brcmfmac43362-sdio.bin +endef +$(eval $(call BuildPackage,brcmfmac-firmware-sdio)) + +Package/brcmfmac-firmware-usb = $(call Package/firmware-default,Broadcom BCM43xx fullmac USB firmware) +define Package/brcmfmac-firmware-usb/install + $(INSTALL_DIR) $(1)/lib/firmware/brcm + $(INSTALL_DATA) \ + $(PKG_BUILD_DIR)/brcm/brcmfmac43236b.bin \ + $(1)/lib/firmware/brcm/ + $(INSTALL_DATA) \ + $(PKG_BUILD_DIR)/brcm/brcmfmac43143.bin \ + $(1)/lib/firmware/brcm/ +endef +$(eval $(call BuildPackage,brcmfmac-firmware-usb)) + +Package/brcmsmac-firmware = $(call Package/firmware-default,Broadcom BCM43xx softmac PCIe firmware) +define Package/brcmsmac-firmware/install + $(INSTALL_DIR) $(1)/lib/firmware/brcm + $(INSTALL_DATA) \ + $(PKG_BUILD_DIR)/$(PKG_LINUX_FIRMWARE_SUBDIR)/brcm/bcm43xx-0.fw \ + $(PKG_BUILD_DIR)/$(PKG_LINUX_FIRMWARE_SUBDIR)/brcm/bcm43xx_hdr-0.fw \ + $(1)/lib/firmware/brcm/ +endef +$(eval $(call BuildPackage,brcmsmac-firmware)) diff --git a/package/kernel/mac80211/Makefile b/package/kernel/mac80211/Makefile index fc5f40811a..ecc8b4f935 100644 --- a/package/kernel/mac80211/Makefile +++ b/package/kernel/mac80211/Makefile @@ -687,7 +687,7 @@ define KernelPackage/brcmsmac $(call KernelPackage/mac80211/Default) TITLE:=Broadcom IEEE802.11n PCIe SoftMAC WLAN driver URL:=https://wireless.wiki.kernel.org/en/users/drivers/brcm80211 - DEPENDS+= +kmod-mac80211 +@DRIVER_11N_SUPPORT +!TARGET_brcm47xx:kmod-bcma +kmod-lib-cordic +kmod-lib-crc8 +kmod-brcmutil + DEPENDS+= +kmod-mac80211 +@DRIVER_11N_SUPPORT +!TARGET_brcm47xx:kmod-bcma +kmod-lib-cordic +kmod-lib-crc8 +kmod-brcmutil +!BRCMSMAC_USE_FW_FROM_WL:brcmsmac-firmware FILES:=$(PKG_BUILD_DIR)/drivers/net/wireless/broadcom/brcm80211/brcmsmac/brcmsmac.ko AUTOLOAD:=$(call AutoProbe,brcmsmac) MENU:=1 @@ -719,7 +719,10 @@ define KernelPackage/brcmfmac $(call KernelPackage/mac80211/Default) TITLE:=Broadcom IEEE802.11n USB FullMAC WLAN driver URL:=https://wireless.wiki.kernel.org/en/users/drivers/brcm80211 - DEPENDS+= @USB_SUPPORT +kmod-cfg80211 +@DRIVER_11N_SUPPORT +kmod-brcmutil +BRCMFMAC_SDIO:kmod-mmc +BRCMFMAC_USB:kmod-usb-core + DEPENDS+= @USB_SUPPORT +kmod-cfg80211 +@DRIVER_11N_SUPPORT +kmod-brcmutil \ + +BRCMFMAC_PCIE:brcmfmac-firmware-pcie \ + +BRCMFMAC_SDIO:kmod-mmc +BRCMFMAC_SDIO:brcmfmac-firmware-sdio \ + +BRCMFMAC_USB:kmod-usb-core +BRCMFMAC_USB:brcmfmac-firmware-usb FILES:=$(PKG_BUILD_DIR)/drivers/net/wireless/broadcom/brcm80211/brcmfmac/brcmfmac.ko AUTOLOAD:=$(call AutoProbe,brcmfmac) endef @@ -1777,36 +1780,6 @@ define KernelPackage/brcmsmac/install ifeq ($(CONFIG_BRCMSMAC_USE_FW_FROM_WL),y) tar xjf "$(DL_DIR)/$(PKG_BRCMSMAC_FW_SOURCE)" -C "$(PKG_BUILD_DIR)" b43-fwcutter --brcmsmac -w $(1)/lib/firmware/ $(PKG_BUILD_DIR)/$(PKG_BRCMSMAC_FW_OBJECT) -else - $(INSTALL_DATA) \ - $(PKG_BUILD_DIR)/$(PKG_LINUX_FIRMWARE_SUBDIR)/brcm/bcm43xx-0.fw \ - $(PKG_BUILD_DIR)/$(PKG_LINUX_FIRMWARE_SUBDIR)/brcm/bcm43xx_hdr-0.fw \ - $(1)/lib/firmware/brcm/ -endif -endef - -define KernelPackage/brcmfmac/install - $(INSTALL_DIR) $(1)/lib/firmware/brcm -ifneq ($(CONFIG_BRCMFMAC_USB),) - $(INSTALL_DATA) \ - $(PKG_BUILD_DIR)/$(PKG_LINUX_FIRMWARE_SUBDIR)/brcm/brcmfmac43236b.bin \ - $(1)/lib/firmware/brcm/ - $(INSTALL_DATA) \ - $(PKG_BUILD_DIR)/$(PKG_LINUX_FIRMWARE_SUBDIR)/brcm/brcmfmac43143.bin \ - $(1)/lib/firmware/brcm/ -endif -ifneq ($(CONFIG_BRCMFMAC_PCIE),) - $(INSTALL_DATA) \ - $(PKG_BUILD_DIR)/$(PKG_LINUX_FIRMWARE_SUBDIR)/brcm/brcmfmac43602-pcie.ap.bin \ - $(1)/lib/firmware/brcm/brcmfmac43602-pcie.bin -endif -ifneq ($(CONFIG_BRCMFMAC_SDIO),) - $(INSTALL_DATA) \ - $(PKG_BUILD_DIR)/$(PKG_LINUX_FIRMWARE_SUBDIR)/brcm/brcmfmac4329-sdio.bin \ - $(1)/lib/firmware/brcm/brcmfmac4329-sdio.bin - $(INSTALL_DATA) \ - $(PKG_BUILD_DIR)/$(PKG_LINUX_FIRMWARE_SUBDIR)/brcm/brcmfmac43362-sdio.bin \ - $(1)/lib/firmware/brcm/brcmfmac43362-sdio.bin endif endef |