package/linux-firmware: split bcm43xx / bcm43xxx

linux-firmware has gained a few firmware files for Broadcom WiFi
chipsets. Installing all of them takes a lot of place, when usually only
one is really needed.

Split the Broadcom BRCM drivers in two categories: bcm43xx and bcm43xxx,
when they were previously a single config option, so as to reclaim a bit
of space.

Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>

diff --git a/package/linux-firmware/Config.in b/package/linux-firmware/Config.in
index ba41598847c603ddf5f18c206a0cf3d771e30b00..3f942051e0a86df594cf7956fc9e3c2935f2e678 100644 (file)
--- a/package/linux-firmware/Config.in
+++ b/package/linux-firmware/Config.in
@@ -26,10 +26,14 @@ config BR2_PACKAGE_LINUX_FIRMWARE_ATHEROS_9271
          Firmware files for the Atheros 9271 module
 
 config BR2_PACKAGE_LINUX_FIRMWARE_BRCM_BCM43XX
-       bool "Broadcom BRCM bcm43xx/43xxx"
+       bool "Broadcom BRCM bcm43xx"
        help
-         Firmware files for the Broadcom bcm43xx and bcm43xxx,
-         SoftMAC and FullMAC.
+         Firmware files for the Broadcom bcm43xx SoftMAC and FullMAC.
+
+config BR2_PACKAGE_LINUX_FIRMWARE_BRCM_BCM43XXX
+       bool "Broadcom BRCM bcm43xxx"
+       help
+         Firmware files for the Broadcom bcm43xxx, SoftMAC and FullMAC.
 
 config BR2_PACKAGE_LINUX_FIRMWARE_IWLWIFI_3160
        bool "Intel iwlwifi 3160"

diff --git a/package/linux-firmware/linux-firmware.mk b/package/linux-firmware/linux-firmware.mk
index 43edf6485b3d09071ad2c09e2cb2ec6420f0d298..3da757f91eee310639e2a3b6d0f29b6875d7e129 100644 (file)
--- a/package/linux-firmware/linux-firmware.mk
+++ b/package/linux-firmware/linux-firmware.mk
@@ -183,14 +183,19 @@ LINUX_FIRMWARE_FILES += dvb-usb-terratec-h5-drxk.fw
 # which is installed unconditionally
 endif
 
-# brcm
+# brcm43xx
 ifeq ($(BR2_PACKAGE_LINUX_FIRMWARE_BRCM_BCM43XX),y)
 LINUX_FIRMWARE_FILES += brcm/bcm43xx-0.fw brcm/bcm43xx_hdr-0.fw \
-                       brcm/bcm4329-fullmac-4.bin brcm/brcmfmac43236b.bin \
-                       brcm/brcmfmac43241b0-sdio.bin brcm/brcmfmac43241b4-sdio.bin \
-                       brcm/brcmfmac4329-sdio.bin brcm/brcmfmac4330-sdio.bin \
-                       brcm/brcmfmac4334-sdio.bin brcm/brcmfmac4335-sdio.bin \
-                       brcm/brcmfmac43362-sdio.bin
+                       brcm/bcm4329-fullmac-4.bin brcm/brcmfmac4329-sdio.bin \
+                       brcm/brcmfmac4330-sdio.bin brcm/brcmfmac4334-sdio.bin \
+                       brcm/brcmfmac4335-sdio.bin
+LINUX_FIRMWARE_ALL_LICENSE_FILES += LICENCE.broadcom_bcm43xx
+endif
+
+# brcm43xxx
+ifeq ($(BR2_PACKAGE_LINUX_FIRMWARE_BRCM_BCM43XXX),y)
+LINUX_FIRMWARE_FILES += brcm/brcmfmac43236b.bin brcm/brcmfmac43241b0-sdio.bin \
+                       brcm/brcmfmac43241b4-sdio.bin brcm/brcmfmac43362-sdio.bin
 LINUX_FIRMWARE_ALL_LICENSE_FILES += LICENCE.broadcom_bcm43xx
 endif