linux-firmware: broadcom: consolidate NVRAM packages

[openwrt/staging/dedeckeh.git] / target / linux / bcm27xx / image / Makefile

diff --git a/target/linux/bcm27xx/image/Makefile b/target/linux/bcm27xx/image/Makefile
index e605a9a5c8e6c29c29bec6918583b1eb92cb62f9..1334386c574dd77ed4d942bf31256e7eb44762be 100644 (file)
--- a/target/linux/bcm27xx/image/Makefile
+++ b/target/linux/bcm27xx/image/Makefile
@@ -76,7 +76,7 @@ define Device/rpi
        raspberrypi,model-zero raspberrypi,model-zero-w
   DEVICE_PACKAGES := \
        cypress-firmware-43430-sdio \
-       brcmfmac-firmware-43430-sdio-rpi-zero-w \
+       brcmfmac-nvram-43430-sdio \
        kmod-brcmfmac wpad-basic-wolfssl
 endef
 ifeq ($(SUBTARGET),bcm2708)
@@ -107,11 +107,9 @@ define Device/rpi-2
        raspberrypi,model-zero-2
   DEVICE_PACKAGES := \
        cypress-firmware-43430-sdio \
-       brcmfmac-firmware-43430-sdio-rpi-3b \
+       brcmfmac-nvram-43430-sdio \
        cypress-firmware-43455-sdio \
-       brcmfmac-firmware-43455-sdio-rpi-3b-plus \
-       brcmfmac-firmware-43455-sdio-rpi-4b \
-       brcmfmac-firmware-43455-sdio-rpi-cm4 \
+       brcmfmac-nvram-43455-sdio \
        kmod-brcmfmac wpad-basic-wolfssl
   IMAGE/sysupgrade.img.gz := boot-common | boot-2708 | boot-2711 | sdcard-img | gzip | append-metadata
   IMAGE/factory.img.gz := boot-common | boot-2708 | boot-2711 | sdcard-img | gzip
@@ -140,9 +138,9 @@ define Device/rpi-3
        raspberrypi,model-zero-2
   DEVICE_PACKAGES := \
        cypress-firmware-43430-sdio \
-       brcmfmac-firmware-43430-sdio-rpi-3b \
+       brcmfmac-nvram-43430-sdio \
        cypress-firmware-43455-sdio \
-       brcmfmac-firmware-43455-sdio-rpi-3b-plus \
+       brcmfmac-nvram-43455-sdio \
        kmod-brcmfmac wpad-basic-wolfssl
 endef
 ifeq ($(SUBTARGET),bcm2710)
@@ -163,8 +161,7 @@ define Device/rpi-4
        raspberrypi,4-model-b
   DEVICE_PACKAGES := \
        cypress-firmware-43455-sdio \
-       brcmfmac-firmware-43455-sdio-rpi-4b \
-       brcmfmac-firmware-43455-sdio-rpi-cm4 \
+       brcmfmac-nvram-43455-sdio \
        kmod-brcmfmac wpad-basic-wolfssl \
        kmod-usb-net-lan78xx
   IMAGE/sysupgrade.img.gz := boot-common | boot-2711 | sdcard-img | gzip | append-metadata