Skip to contentSkip to conversation

linux-firmware: menu entries for mwifiex blobs

PATCH New Alex Suykov 2 participants 3 messages Nov 8, 2015 – Nov 12, 2015

lore
Share & tools
lore
#0 lore raw

PATCH 1/2 linux-firmware: menu entries for mwifiex blobs

Firmware blobs for Marvell WiFi-Ex 8797, 8887, 8897 were already there in linux-firmware tree but relevant options were not in Config.in.

---
sd8797 is the only one I'm going to use, but since they are all similar I added the rest as well.

 package/linux-firmware/Config.in         | 30 ++++++++++++++++++++++++++
 package/linux-firmware/linux-firmware.mk | 36 ++++++++++++++++++++++++++++++++
 2 files changed, 66 insertions(+)
package/linux-firmware/Config.in +30 -0
index 2e4c205..32e9c6e 100644
@@ -159,6 +159,36 @@ config BR2_PACKAGE_LINUX_FIRMWARE_MWIFIEX_SD8787
 	help
 	  Firmware files for the Marvell Wifi-Ex 8787 module on SDIO.
 
+config BR2_PACKAGE_LINUX_FIRMWARE_MWIFIEX_SD8797
+	bool "Marvell Wifi-Ex SD 8797"
+	help
+	  Firmware files for the Marvell Wifi-Ex 8797 module on SDIO.
+
+config BR2_PACKAGE_LINUX_FIRMWARE_MWIFIEX_USB8797
+	bool "Marvell Wifi-Ex USB 8797"
+	help
+	  Firmware files for the Marvell Wifi-Ex 8797 module on USB.
+
+config BR2_PACKAGE_LINUX_FIRMWARE_MWIFIEX_SD8887
+	bool "Marvell Wifi-Ex SD 8887"
+	help
+	  Firmware files for the Marvell Wifi-Ex 8887 module on SDIO.
+
+config BR2_PACKAGE_LINUX_FIRMWARE_MWIFIEX_SD8897
+	bool "Marvell Wifi-Ex SD 8897"
+	help
+	  Firmware files for the Marvell Wifi-Ex 8897 module on SDIO.
+
+config BR2_PACKAGE_LINUX_FIRMWARE_MWIFIEX_USB8897
+	bool "Marvell Wifi-Ex USB 8897"
+	help
+	  Firmware files for the Marvell Wifi-Ex 8897 module on USB.
+
+config BR2_PACKAGE_LINUX_FIRMWARE_MWIFIEX_PCIE8897
+	bool "Marvell Wifi-Ex PCI-E 8897"
+	help
+	  Firmware files for the Marvell Wifi-Ex 8897 module on PCI-E.
+
 config BR2_PACKAGE_LINUX_FIRMWARE_RALINK_RT61
 	bool "Ralink rt2501/rt61"
 	help
package/linux-firmware/linux-firmware.mk +36 -0
index 768f3c4..d3efd65 100644
@@ -129,6 +129,42 @@ LINUX_FIRMWARE_FILES += mrvl/sd8787_uapsta.bin
 LINUX_FIRMWARE_ALL_LICENSE_FILES += LICENCE.Marvell
 endif
 
+# sd8797
+ifeq ($(BR2_PACKAGE_LINUX_FIRMWARE_MWIFIEX_SD8797),y)
+LINUX_FIRMWARE_FILES += mrvl/sd8797_uapsta.bin
+LINUX_FIRMWARE_ALL_LICENSE_FILES += LICENCE.Marvell
+endif
+
+# usb8797
+ifeq ($(BR2_PACKAGE_LINUX_FIRMWARE_MWIFIEX_USB8797),y)
+LINUX_FIRMWARE_FILES += mrvl/usb8797_uapsta.bin
+LINUX_FIRMWARE_ALL_LICENSE_FILES += LICENCE.Marvell
+endif
+
+# sd8887
+ifeq ($(BR2_PACKAGE_LINUX_FIRMWARE_MWIFIEX_SD8887),y)
+LINUX_FIRMWARE_FILES += mrvl/sd8887_uapsta.bin
+LINUX_FIRMWARE_ALL_LICENSE_FILES += LICENCE.Marvell
+endif
+
+# sd8897
+ifeq ($(BR2_PACKAGE_LINUX_FIRMWARE_MWIFIEX_SD8897),y)
+LINUX_FIRMWARE_FILES += mrvl/sd8897_uapsta.bin
+LINUX_FIRMWARE_ALL_LICENSE_FILES += LICENCE.Marvell
+endif
+
+# usb8897
+ifeq ($(BR2_PACKAGE_LINUX_FIRMWARE_MWIFIEX_USB8897),y)
+LINUX_FIRMWARE_FILES += mrvl/usb8897_uapsta.bin
+LINUX_FIRMWARE_ALL_LICENSE_FILES += LICENCE.Marvell
+endif
+
+# pcie8897
+ifeq ($(BR2_PACKAGE_LINUX_FIRMWARE_MWIFIEX_PCIE8897),y)
+LINUX_FIRMWARE_FILES += mrvl/pcie8897_uapsta.bin
+LINUX_FIRMWARE_ALL_LICENSE_FILES += LICENCE.Marvell
+endif
+
 # wl127x
 ifeq ($(BR2_PACKAGE_LINUX_FIRMWARE_TI_WL127X),y)
 # wl1271-nvs.bin is a symlink to wl127x-nvs.bin
Signature · 1 line
2.0.3
#1 lore raw

PATCH 2/2 linux-firmware: adjust Config.in text for mwifiex

With SD, USB and PCI-E variants available for several chips, bus-prefixed entries get mis-aligned badly. Rearrange them to use bus-suffixes instead.

Config options and the files themselves remain bus-prefixed.

---
 package/linux-firmware/Config.in | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)
package/linux-firmware/Config.in +7 -7
index 32e9c6e..d838986 100644
@@ -155,37 +155,37 @@ config BR2_PACKAGE_LINUX_FIRMWARE_LIBERTAS_SD8688
 	  Firmware files for the Marvell SD8688 module
 
 config BR2_PACKAGE_LINUX_FIRMWARE_MWIFIEX_SD8787
-	bool "Marvell Wifi-Ex SD 8787"
+	bool "Marvell Wifi-Ex 8787 SDIO"
 	help
 	  Firmware files for the Marvell Wifi-Ex 8787 module on SDIO.
 
 config BR2_PACKAGE_LINUX_FIRMWARE_MWIFIEX_SD8797
-	bool "Marvell Wifi-Ex SD 8797"
+	bool "Marvell Wifi-Ex 8797 SDIO"
 	help
 	  Firmware files for the Marvell Wifi-Ex 8797 module on SDIO.
 
 config BR2_PACKAGE_LINUX_FIRMWARE_MWIFIEX_USB8797
-	bool "Marvell Wifi-Ex USB 8797"
+	bool "Marvell Wifi-Ex 8797 USB"
 	help
 	  Firmware files for the Marvell Wifi-Ex 8797 module on USB.
 
 config BR2_PACKAGE_LINUX_FIRMWARE_MWIFIEX_SD8887
-	bool "Marvell Wifi-Ex SD 8887"
+	bool "Marvell Wifi-Ex 8887 SDIO"
 	help
 	  Firmware files for the Marvell Wifi-Ex 8887 module on SDIO.
 
 config BR2_PACKAGE_LINUX_FIRMWARE_MWIFIEX_SD8897
-	bool "Marvell Wifi-Ex SD 8897"
+	bool "Marvell Wifi-Ex 8897 SDIO"
 	help
 	  Firmware files for the Marvell Wifi-Ex 8897 module on SDIO.
 
 config BR2_PACKAGE_LINUX_FIRMWARE_MWIFIEX_USB8897
-	bool "Marvell Wifi-Ex USB 8897"
+	bool "Marvell Wifi-Ex 8897 USB"
 	help
 	  Firmware files for the Marvell Wifi-Ex 8897 module on USB.
 
 config BR2_PACKAGE_LINUX_FIRMWARE_MWIFIEX_PCIE8897
-	bool "Marvell Wifi-Ex PCI-E 8897"
+	bool "Marvell Wifi-Ex 8897 PCI-E"
 	help
 	  Firmware files for the Marvell Wifi-Ex 8897 module on PCI-E.
 
Signature · 1 line
2.0.3
#2 lore raw

PATCH 1/2 linux-firmware: menu entries for mwifiex blobs

In reply to Alex Suykov
Quoted 9 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Alex" == Alex Suykov <[email protected]> writes:

Firmware blobs for Marvell WiFi-Ex 8797, 8887, 8897 were already there in linux-firmware tree but relevant options were not in Config.in.

---
sd8797 is the only one I'm going to use, but since they are all similar I added the rest as well.

Committed both to next, thanks.

Signature · 1 line
Bye, Peter Korsgaard