[openwrt/openwrt] cypress-nvram: consolidate NVRAM packages

[LEDE Commits]

noltari pushed a commit to openwrt/openwrt.git, branch master:
https://git.openwrt.org/49bbfd9968879f3aa6df07871703a2643254bf60

commit 49bbfd9968879f3aa6df07871703a2643254bf60
Author: Kuan-Yi Li <kyli at abysm.org>
AuthorDate: Mon Nov 14 13:09:58 2022 +0800

    cypress-nvram: consolidate NVRAM packages
    
    NVRAM packages for the same wireless chip are consolidated into one as
    they contain only small text files and symlinks.
    
    Signed-off-by: Kuan-Yi Li <kyli at abysm.org>
---
 package/firmware/cypress-nvram/Makefile | 26 ++++++--------------------
 target/linux/imx/image/cortexa7.mk      |  2 +-
 2 files changed, 7 insertions(+), 21 deletions(-)

diff --git a/package/firmware/cypress-nvram/Makefile b/package/firmware/cypress-nvram/Makefile
index 598abd4d99..dcf09d9599 100644
--- a/package/firmware/cypress-nvram/Makefile
+++ b/package/firmware/cypress-nvram/Makefile
@@ -3,7 +3,7 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=cypress-nvram
-PKG_RELEASE:=6
+PKG_RELEASE:=7
 
 PKG_MAINTAINER:=Álvaro Fernández Rojas <noltari at gmail.com>
 
@@ -18,35 +18,21 @@ define Build/Compile
 	true
 endef
 
-# Cypress 4339 SDIO AP6335 NVRAM
-define Package/cypress-nvram-4339-sdio-ap6335
+# Cypress 4339 SDIO NVRAM
+define Package/cypress-nvram-4339-sdio
   $(Package/cypress-nvram-default)
-  TITLE:=BCM4339 NVRAM for AP6335
+  TITLE:=BCM4339 SDIO NVRAM
   CONFLICTS:=brcmfmac-nvram-4339-sdio
 endef
 
-define Package/cypress-nvram-4339-sdio-ap6335/install
+define Package/cypress-nvram-4339-sdio/install
 	$(INSTALL_DIR) $(1)/lib/firmware/brcm
 	$(INSTALL_DATA) \
 		./files/brcmfmac4339-sdio.AP6335.txt \
 		$(1)/lib/firmware/brcm/
-endef
-
-$(eval $(call BuildPackage,cypress-nvram-4339-sdio-ap6335))
-
-# Cypress 4339 SDIO PICO-PI-IMX7D NVRAM
-define Package/cypress-nvram-4339-sdio-pico-pi-imx7d
-  $(Package/cypress-nvram-default)
-  TITLE:=BCM4339 NVRAM for TechNexion PICO-PI-IMX7D
-  DEPENDS:=+cypress-nvram-4339-sdio-ap6335
-  CONFLICTS:=brcmfmac-nvram-4339-sdio
-endef
-
-define Package/cypress-nvram-4339-sdio-pico-pi-imx7d/install
-	$(INSTALL_DIR) $(1)/lib/firmware/brcm
 	$(LN) \
 		brcmfmac4339-sdio.AP6335.txt \
 		$(1)/lib/firmware/brcm/brcmfmac4339-sdio.technexion,imx7d-pico-pi.txt
 endef
 
-$(eval $(call BuildPackage,cypress-nvram-4339-sdio-pico-pi-imx7d))
+$(eval $(call BuildPackage,cypress-nvram-4339-sdio))
diff --git a/target/linux/imx/image/cortexa7.mk b/target/linux/imx/image/cortexa7.mk
index 00c57c3e12..d5a23fc6e9 100644
--- a/target/linux/imx/image/cortexa7.mk
+++ b/target/linux/imx/image/cortexa7.mk
@@ -21,7 +21,7 @@ define Device/technexion_imx7d-pico-pi
   DEVICE_PACKAGES := kmod-sound-core kmod-sound-soc-imx kmod-sound-soc-imx-sgtl5000 \
 	kmod-can kmod-can-flexcan kmod-can-raw kmod-leds-gpio \
 	kmod-input-touchscreen-edt-ft5x06 kmod-usb-hid kmod-btsdio \
-	kmod-brcmfmac brcmfmac-firmware-4339-sdio cypress-nvram-4339-sdio-pico-pi-imx7d
+	kmod-brcmfmac brcmfmac-firmware-4339-sdio cypress-nvram-4339-sdio
   FILESYSTEMS := squashfs
   IMAGES := combined.bin sysupgrade.bin
   IMAGE/combined.bin := append-rootfs | pad-extra 128k | imx-sdcard-raw-uboot