From: Christian Lamparter <chunkeey@gmail.com>
Date: Fri, 1 Jul 2022 19:39:10 +0000 (+0200)
Subject: module/firmware: remove intersil PRISM54 support
X-Git-Url: http://git.openwrt.org/?p=openwrt%2Fstaging%2Fdedeckeh.git;a=commitdiff_plain;h=cb3d0250db79ad7aa9ed167b7afdd33c874fb7bb

module/firmware: remove intersil PRISM54 support

the legacy driver was dropped in linux 5.14-rc3:
commit d249ff28b1d8 ("intersil: remove obsolete prism54 wireless driver")

Quoting Lukas Bulwahn:
"p54 replaces prism54 so users should be unaffected."

Reported-by: Marius Dinu <m95d+git@psihoexpert.ro>
Signed-off-by: Christian Lamparter <chunkeey@gmail.com>
---

diff --git a/package/firmware/prism54-firmware/Makefile b/package/firmware/prism54-firmware/Makefile
index 2752ac7580..b74cb682fc 100644
--- a/package/firmware/prism54-firmware/Makefile
+++ b/package/firmware/prism54-firmware/Makefile
@@ -8,25 +8,17 @@ include $(TOPDIR)/rules.mk
 PKG_NAME:=prism54-firmware
 PKG_RELEASE:=1
 
-# Prism54 FullMAC firmware (jbnore.free.fr seems to be rather slow, so we use daemonizer.de)
+# P54 SoftMAC firmware (jbnore.free.fr seems to be rather slow, so we use daemonizer.de)
 PRG_URL:=https://daemonizer.de/prism54/prism54-fw/
 
 include $(INCLUDE_DIR)/package.mk
 
 
-# PRISM54/P54 firmwares
-PRISM54FW:=1.0.4.3.arm
+# P54 firmwares
 P54USBFW:=2.13.24.0.lm87.arm
 P54PCIFW:=2.13.12.0.arm
 P54SPIFW:=2.13.0.0.a.13.14.arm
 
-define Download/prism54-firmware
-  FILE:=$(PRISM54FW)
-  URL:=$(PRG_URL)/fw-fullmac
-  HASH:=dce24156c57234dba131429fbe8cd1de8ba818c9481ddc33cf7e5af9d57a737c
-endef
-$(eval $(call Download,prism54-firmware))
-
 define Download/p54-usb-firmware
   FILE:=$(P54USBFW)
   URL:=$(PRG_URL)/fw-usb
@@ -55,11 +47,6 @@ define Package/prism54-firmware-default
   URL:=https://daemonizer.de/prism54/prism54-fw
 endef
 
-define Package/prism54-firmware
-$(Package/prism54-firmware-default)
-  TITLE:=prism54 firmware
-endef
-
 define Package/p54-usb-firmware
 $(Package/prism54-firmware-default)
   TITLE:=p54-usb firmware
@@ -84,11 +71,6 @@ define Build/Compile
 
 endef
 
-define Package/prism54-firmware/install
-	$(INSTALL_DIR) $(1)/lib/firmware
-	$(INSTALL_DATA) $(DL_DIR)/$(PRISM54FW) $(1)/lib/firmware/isl3890
-endef
-
 define Package/p54-usb-firmware/install
 	$(INSTALL_DIR) $(1)/lib/firmware
 	$(INSTALL_DATA) $(DL_DIR)/$(P54USBFW) $(1)/lib/firmware/isl3887usb
@@ -105,7 +87,6 @@ define Package/p54-spi-firmware/install
 endef
 
 
-$(eval $(call BuildPackage,prism54-firmware))
 $(eval $(call BuildPackage,p54-usb-firmware))
 $(eval $(call BuildPackage,p54-pci-firmware))
 $(eval $(call BuildPackage,p54-spi-firmware))
diff --git a/package/kernel/linux/modules/wireless.mk b/package/kernel/linux/modules/wireless.mk
index f7a40ba10a..1e9e68a0f6 100644
--- a/package/kernel/linux/modules/wireless.mk
+++ b/package/kernel/linux/modules/wireless.mk
@@ -7,23 +7,6 @@
 
 WIRELESS_MENU:=Wireless Drivers
 
-define KernelPackage/net-prism54
-  SUBMENU:=$(WIRELESS_MENU)
-  TITLE:=Intersil Prism54 support
-  DEPENDS:=@PCI_SUPPORT +@DRIVER_WEXT_SUPPORT +prism54-firmware
-  KCONFIG:=CONFIG_PRISM54
-  FILES:= \
-	$(LINUX_DIR)/drivers/net/wireless/intersil/prism54/prism54.ko
-  AUTOLOAD:=$(call AutoProbe,prism54)
-endef
-
-define KernelPackage/net-prism54/description
- Kernel modules for Intersil Prism54 support
-endef
-
-$(eval $(call KernelPackage,net-prism54))
-
-
 define KernelPackage/net-rtl8192su
   SUBMENU:=$(WIRELESS_MENU)
   TITLE:=RTL8192SU support (staging)