From: Lech Perczak <lech.perczak@gmail.com>
Date: Thu, 28 Apr 2022 20:59:03 +0000 (+0200)
Subject: linux-firmware: use upstream firmware for cypress-firmware-4339-sdio
X-Git-Tag: v23.05.0-rc1~2999
X-Git-Url: http://git.openwrt.org/?a=commitdiff_plain;h=6f6c2fb32176b538a8d13d896e7842ae27950925;p=openwrt%2Fstaging%2Fhauke.git

linux-firmware: use upstream firmware for cypress-firmware-4339-sdio

Old firmware provided by 'cypress-firmware' suite is not sufficient for
AP6335 module used in PICO-PI-IMX7D board to probe successfully. Use the
upstream version from linux-firmware instead.

At the same time, drop the old firmware from 'cypress-firmware' package.

Signed-off-by: Lech Perczak <lech.perczak@gmail.com>
---

diff --git a/package/firmware/cypress-firmware/Makefile b/package/firmware/cypress-firmware/Makefile
index c5f41e0cb4..769e69a973 100644
--- a/package/firmware/cypress-firmware/Makefile
+++ b/package/firmware/cypress-firmware/Makefile
@@ -81,21 +81,6 @@ endef
 
 $(eval $(call BuildPackage,cypress-firmware-43362-sdio))
 
-# Cypress 4339 SDIO Firmware
-define Package/cypress-firmware-4339-sdio
-  $(Package/cypress-firmware-default)
-  TITLE:=CYW4339 FullMac SDIO firmware
-endef
-
-define Package/cypress-firmware-4339-sdio/install
-	$(INSTALL_DIR) $(1)/lib/firmware/brcm
-	$(INSTALL_DATA) \
-		$(PKG_BUILD_DIR)/firmware/cyfmac4339-sdio.bin \
-		$(1)/lib/firmware/brcm/brcmfmac4339-sdio.bin
-endef
-
-$(eval $(call BuildPackage,cypress-firmware-4339-sdio))
-
 # Cypress 43430 SDIO Firmware
 define Package/cypress-firmware-43430-sdio
   $(Package/cypress-firmware-default)
diff --git a/package/firmware/linux-firmware/cypress.mk b/package/firmware/linux-firmware/cypress.mk
new file mode 100644
index 0000000000..2f5b66fecf
--- /dev/null
+++ b/package/firmware/linux-firmware/cypress.mk
@@ -0,0 +1,8 @@
+Package/cypress-firmware-4339-sdio = $(call Package/firmware-default,Broadcom BCM4339 FullMac SDIO firmware)
+define Package/cypress-firmware-4339-sdio/install
+	$(INSTALL_DIR) $(1)/lib/firmware/brcm
+	$(INSTALL_DATA) \
+		$(PKG_BUILD_DIR)/cypress/cyfmac4339-sdio.bin \
+		$(1)/lib/firmware/brcm/brcmfmac4339-sdio.bin
+endef
+$(eval $(call BuildPackage,cypress-firmware-4339-sdio))