diff --git a/package/firmware/cypress-firmware/Makefile b/package/firmware/cypress-firmware/Makefile
index 31887280c3..4fef8522cd 100644
--- a/package/firmware/cypress-firmware/Makefile
+++ b/package/firmware/cypress-firmware/Makefile
@@ -7,25 +7,24 @@
 
 include $(TOPDIR)/rules.mk
 
-UNPACK_CMD=unzip -q -p $(DL_DIR)/$(PKG_SOURCE) $(PKG_SOURCE_UNZIP) | gzip -dc | $(HOST_TAR) -C $(1) $(TAR_OPTIONS)
-
 PKG_NAME:=cypress-firmware
-PKG_VERSION:=v5.4.18-2021_0527
+PKG_VERSION:=5.4.18-2021_0812
 PKG_RELEASE:=1
 
-PKG_SOURCE_UNZIP:=cypress-firmware-$(PKG_VERSION).tar.gz
-PKG_SOURCE:=cypress-fmac-$(PKG_VERSION).zip
-PKG_SOURCE_URL:=https://community.cypress.com/gfawx74859/attachments/gfawx74859/WiFiBluetoothLinux/1911/2/
-PKG_HASH:=6dd1fe42791cb56fa4162d0a384cdca4052a428a259200afdc1eb2caa53543aa
+PKG_SOURCE_PROTO:=git
+PKG_SOURCE_URL:=https://github.com/Infineon/ifx-linux-firmware/
+PKG_MIRROR_HASH:=ac882b482dd401b53cdecc6004cd2bd3d65e888c19206dcf10931a28033ada4d
+PKG_SOURCE_VERSION:=release-v$(PKG_VERSION)
 
 PKG_MAINTAINER:=Álvaro Fernández Rojas <noltari@gmail.com>
+PKG_LICENSE_FILES:=LICENCE
 
 include $(INCLUDE_DIR)/package.mk
 
 define Package/cypress-firmware-default
   SECTION:=firmware
   CATEGORY:=Firmware
-  URL:=https://community.cypress.com/community/linux
+  URL:=https://community.infineon.com/
 endef
 
 define Build/Compile
@@ -209,6 +208,42 @@ endef
 
 $(eval $(call BuildPackage,cypress-firmware-43570-pcie))
 
+# Cypress 4359 PCIe Firmware
+define Package/cypress-firmware-4359-pcie
+  $(Package/cypress-firmware-default)
+  TITLE:=CYW4359 FullMac PCIe firmware
+endef
+
+define Package/cypress-firmware-4359-pcie/install
+	$(INSTALL_DIR) $(1)/lib/firmware/brcm
+	$(INSTALL_DATA) \
+		$(PKG_BUILD_DIR)/firmware/cyfmac4359-pcie.bin \
+		$(1)/lib/firmware/brcm/brcmfmac4359-pcie.bin
+	$(INSTALL_DATA) \
+		$(PKG_BUILD_DIR)/firmware/cyfmac4359-pcie.clm_blob \
+		$(1)/lib/firmware/brcm/brcmfmac4359-pcie.clm_blob
+endef
+
+$(eval $(call BuildPackage,cypress-firmware-4359-pcie))
+
+# Cypress 4359 SDIO Firmware
+define Package/cypress-firmware-4359-sdio
+  $(Package/cypress-firmware-default)
+  TITLE:=CYW4359 FullMac SDIO firmware
+endef
+
+define Package/cypress-firmware-4359-sdio/install
+	$(INSTALL_DIR) $(1)/lib/firmware/brcm
+	$(INSTALL_DATA) \
+		$(PKG_BUILD_DIR)/firmware/cyfmac4359-sdio.bin \
+		$(1)/lib/firmware/brcm/brcmfmac4359-sdio.bin
+	$(INSTALL_DATA) \
+		$(PKG_BUILD_DIR)/firmware/cyfmac4359-sdio.clm_blob \
+		$(1)/lib/firmware/brcm/brcmfmac4359-sdio.clm_blob
+endef
+
+$(eval $(call BuildPackage,cypress-firmware-4359-sdio))
+
 # Cypress 4373 SDIO Firmware
 define Package/cypress-firmware-4373-sdio
   $(Package/cypress-firmware-default)
@@ -263,3 +298,20 @@ endef
 
 $(eval $(call BuildPackage,cypress-firmware-54591-pcie))
 
+# Cypress 89459 PCIe Firmware
+define Package/cypress-firmware-89459-pcie
+  $(Package/cypress-firmware-default)
+  TITLE:=CYW89459 FullMac PCIe firmware
+endef
+
+define Package/cypress-firmware-89459-pcie/install
+	$(INSTALL_DIR) $(1)/lib/firmware/brcm
+	$(INSTALL_DATA) \
+		$(PKG_BUILD_DIR)/firmware/cyfmac89459-pcie.bin \
+		$(1)/lib/firmware/brcm/brcmfmac89459-pcie.bin
+	$(INSTALL_DATA) \
+		$(PKG_BUILD_DIR)/firmware/cyfmac89459-pcie.clm_blob \
+		$(1)/lib/firmware/brcm/brcmfmac89459-pcie.clm_blob
+endef
+
+$(eval $(call BuildPackage,cypress-firmware-89459-pcie))