linux-firmware: separate packages for Broadcom FullMAC PCIe firmwares

Using few packages will allow saving some space by decreasing rootfs
size. Dropping 43602a1 firmware saves 316 580 B. Dropping 4366b1 saves
468 188 B.

Moreover there are more firmware files that may require packaging and
even more to come later (e.g. 4366c0).

This can especially useful now, with per device rootfs.

Signed-off-by: Rafał Miłecki <rafal@milecki.pl>

diff --git a/package/firmware/linux-firmware/broadcom.mk b/package/firmware/linux-firmware/broadcom.mk
index 659dc825ef6256d60fd8f302835c663e856c8f68..45d6b33542c36ea7375867730dc550a001acb1b2 100644 (file)
--- a/package/firmware/linux-firmware/broadcom.mk
+++ b/package/firmware/linux-firmware/broadcom.mk
@@ -1,14 +1,20 @@
-Package/brcmfmac-firmware-pcie = $(call Package/firmware-default,Broadcom BCM43xx fullmac PCIe firmware)
-define Package/brcmfmac-firmware-pcie/install
+Package/brcmfmac-firmware-43602a1-pcie = $(call Package/firmware-default,Broadcom 43602a1 FullMAC PCIe firmware)
+define Package/brcmfmac-firmware-43602a1-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-43602a1-pcie))
+
+Package/brcmfmac-firmware-4366b1-pcie = $(call Package/firmware-default,Broadcom 4366b1 FullMAC PCIe firmware)
+define Package/brcmfmac-firmware-4366b1-pcie/install
+       $(INSTALL_DIR) $(1)/lib/firmware/brcm
        $(INSTALL_DATA) \
                $(PKG_BUILD_DIR)/brcm/brcmfmac4366b-pcie.bin \
                $(1)/lib/firmware/brcm/
 endef
-$(eval $(call BuildPackage,brcmfmac-firmware-pcie))
+$(eval $(call BuildPackage,brcmfmac-firmware-4366b1-pcie))
 
 Package/brcmfmac-firmware-sdio = $(call Package/firmware-default,Broadcom BCM43xx fullmac SDIO firmware)
 define Package/brcmfmac-firmware-sdio/install

diff --git a/package/kernel/mac80211/Makefile b/package/kernel/mac80211/Makefile
index 5c0ca3f8851da827acc0cb02b4c6b6bb41f4ab6d..44a2b43abea53f4901e8978c1fb044d52774e236 100644 (file)
--- a/package/kernel/mac80211/Makefile
+++ b/package/kernel/mac80211/Makefile
@@ -682,7 +682,7 @@ define KernelPackage/brcmfmac
   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_PCIE:brcmfmac-firmware-pcie \
+       +BRCMFMAC_PCIE:brcmfmac-firmware-43602a1-pcie +BRCMFMAC_PCIE:brcmfmac-firmware-4366b1-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