From edf90ee7296b8f44508b5e83b4abed46d36aebb6 Mon Sep 17 00:00:00 2001
From: Alexandru Costache <alexandru@balena.io>
Date: Tue, 9 Nov 2021 16:10:31 +0100
Subject: [PATCH] linux-firmware-rpidistro: Package bcm43436 and bcm43436s
 firmware

Signed-off-by: Alexandru Costache <alexandru@balena.io>
---
 .../linux-firmware-rpidistro_git.bb           | 36 +++++++++++++++++--
 1 file changed, 33 insertions(+), 3 deletions(-)

diff --git a/recipes-kernel/linux-firmware-rpidistro/linux-firmware-rpidistro_git.bb b/recipes-kernel/linux-firmware-rpidistro/linux-firmware-rpidistro_git.bb
index d7852ee..45ed78c 100644
--- a/recipes-kernel/linux-firmware-rpidistro/linux-firmware-rpidistro_git.bb
+++ b/recipes-kernel/linux-firmware-rpidistro/linux-firmware-rpidistro_git.bb
@@ -36,8 +36,8 @@ NO_GENERIC_LICENSE[WHENCE] = "WHENCE"
 
 SRC_URI = "git://github.com/RPi-Distro/firmware-nonfree;branch=master;protocol=https"
 
-SRCREV = "83938f78ca2d5a0ffe0c223bb96d72ccc7b71ca5"
-PV = "20190114-1+rpt11"
+SRCREV = "54ffdd6e2ea6055d46656b78e148fe7def3ec9d8"
+PV = "20190114-2+rpt4"
 
 S = "${WORKDIR}/git"
 
@@ -57,7 +57,7 @@ do_install() {
     # Replace outdated linux-firmware files with updated ones from
     # raspbian firmware-nonfree. Raspbian adds blobs and nvram
     # definitions that are also necessary so copy those too.
-    for fw in brcmfmac43430-sdio brcmfmac43455-sdio brcmfmac43456-sdio ; do
+    for fw in brcmfmac43430-sdio brcmfmac43436-sdio brcmfmac43436s-sdio brcmfmac43455-sdio brcmfmac43456-sdio ; do
         install -m 0644 brcm/${fw}.* ${D}${nonarch_base_libdir}/firmware/brcm/
     done
     # add compat links. Fixes errors like
@@ -74,27 +74,57 @@ PACKAGES = "\
     ${PN}-bcm43430 \
     ${PN}-bcm43455 \
     ${PN}-bcm43456 \
+    ${PN}-bcm43436 \
+    ${PN}-bcm43436s \
 "
 
 LICENSE:${PN}-bcm43430 = "Firmware-broadcom_bcm43xx-rpidistro"
+LICENSE:${PN}-bcm43436 = "Firmware-broadcom_bcm43xx-rpidistro"
+LICENSE:${PN}-bcm43436s = "Firmware-broadcom_bcm43xx-rpidistro"
 LICENSE:${PN}-bcm43455 = "Firmware-broadcom_bcm43xx-rpidistro"
 LICENSE:${PN}-bcm43456 = "Firmware-broadcom_bcm43xx-rpidistro"
 LICENSE:${PN}-broadcom-license = "Firmware-broadcom_bcm43xx-rpidistro"
 FILES:${PN}-broadcom-license = "${nonarch_base_libdir}/firmware/LICENCE.broadcom_bcm43xx-rpidistro"
 FILES:${PN}-bcm43430 = "${nonarch_base_libdir}/firmware/brcm/brcmfmac43430*"
+FILES:${PN}-bcm43436 = "${nonarch_base_libdir}/firmware/brcm/brcmfmac43436-*"
+FILES:${PN}-bcm43436s = "${nonarch_base_libdir}/firmware/brcm/brcmfmac43436s*"
 FILES:${PN}-bcm43455 = "${nonarch_base_libdir}/firmware/brcm/brcmfmac43455*"
 FILES:${PN}-bcm43456 = "${nonarch_base_libdir}/firmware/brcm/brcmfmac43456*"
 RDEPENDS:${PN}-bcm43430 += "${PN}-broadcom-license"
+RDEPENDS:${PN}-bcm43436 += "${PN}-broadcom-license"
+RDEPENDS:${PN}-bcm43436s += "${PN}-broadcom-license"
 RDEPENDS:${PN}-bcm43455 += "${PN}-broadcom-license"
 RDEPENDS:${PN}-bcm43456 += "${PN}-broadcom-license"
 RCONFLICTS:${PN}-bcm43430 = "\
     linux-firmware-bcm43430 \
     linux-firmware-raspbian-bcm43430 \
 "
+
 RREPLACES:${PN}-bcm43430 = "\
     linux-firmware-bcm43430 \
     linux-firmware-raspbian-bcm43430 \
 "
+
+RCONFLICTS:${PN}-bcm43436 = "\
+    linux-firmware-bcm43436 \
+    linux-firmware-raspbian-bcm43436 \
+"
+
+RREPLACES:${PN}-bcm43436 = "\
+    linux-firmware-bcm43436 \
+    linux-firmware-raspbian-bcm43436 \
+"
+
+RCONFLICTS:${PN}-bcm43436s = "\
+    linux-firmware-bcm43436s \
+    linux-firmware-raspbian-bcm43436s \
+"
+
+RREPLACES:${PN}-bcm43436s = "\
+    linux-firmware-bcm43436s \
+    linux-firmware-raspbian-bcm43436s \
+"
+
 RCONFLICTS:${PN}-bcm43455 = "\
     linux-firmware-bcm43455 \
     linux-firmware-raspbian-bcm43455 \