Skip to contentSkip to conversation

package/linux-firmware: Add Wilocity 6210 11ad firmware

PATCH New Baruch Siach 2 participants 3 messages Mar 30, 2020 – Apr 2, 2020

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 package/linux-firmware: Add Wilocity 6210 11ad firmware

Cc Yann E. MORIN <[email protected]>
Cc Yegor Yefremov <[email protected]>
---
 package/linux-firmware/Config.in         | 5 +++++
 package/linux-firmware/linux-firmware.mk | 5 +++++
 2 files changed, 10 insertions(+)
package/linux-firmware/Config.in +5 -0
index fb884842d66b..914b514f80bd 100644
@@ -345,6 +345,11 @@ config BR2_PACKAGE_LINUX_FIRMWARE_TI_WL18XX
 	help
 	  Firmware files for WLAN and Bluetooth modules wl18xx
 
+config BR2_PACKAGE_LINUX_FIRMWARE_WILOCITY_WIL6210
+	bool "Wilocity 6210"
+	help
+	  Firmware files for Qualcomm Atheros 11ad family of chips
+
 endmenu
 
 menu "Ethernet firmware"
package/linux-firmware/linux-firmware.mk +5 -0
index 21300ddc72de..e553a2a06383 100644
@@ -373,6 +373,11 @@ LINUX_FIRMWARE_FILES += \
 LINUX_FIRMWARE_ALL_LICENSE_FILES += LICENCE.ti-connectivity
 endif
 
+ifeq ($(BR2_PACKAGE_LINUX_FIRMWARE_WILOCITY_WIL6210),y)
+LINUX_FIRMWARE_FILES += wil6210.*
+LINUX_FIRMWARE_ALL_LICENSE_FILES += LICENSE.QualcommAtheros_ath10k
+endif
+
 ifeq ($(BR2_PACKAGE_LINUX_FIRMWARE_IWLWIFI_3160),y)
 LINUX_FIRMWARE_FILES += iwlwifi-3160-*.ucode
 LINUX_FIRMWARE_ALL_LICENSE_FILES += LICENCE.iwlwifi_firmware
Signature · 1 line
2.25.1
#1 lore raw

PATCH 1/1 package/linux-firmware: Add Wilocity 6210 11ad firmware

Baruch, All,

On 2020-03-30 17:31 +0300, Baruch Siach spake thusly:

Quoted 13 lines
Cc Yann E. MORIN <[email protected]>
Cc Yegor Yefremov <[email protected]>
---
 package/linux-firmware/Config.in         | 5 +++++
 package/linux-firmware/linux-firmware.mk | 5 +++++
 2 files changed, 10 insertions(+)
package/linux-firmware/Config.in +0 -0
index fb884842d66b..914b514f80bd 100644

package/linux-firmware/Config.in config BR2_PACKAGE_LINUX_FIRMWARE_TI_WL18XX · line 349

Quoted 5 lines
package/linux-firmware/Config.in +2 -0
@@ -345,6 +345,11 @@ config BR2_PACKAGE_LINUX_FIRMWARE_TI_WL18XX
 	help
 	  Firmware files for WLAN and Bluetooth modules wl18xx
 
+config BR2_PACKAGE_LINUX_FIRMWARE_WILOCITY_WIL6210
+	bool "Wilocity 6210"

I've been reminded recently that the options are all prefixed with the vendor, followed by the model name/number, so in this case, it should be:

config BR2_PACKAGE_LINUX_FIRMWARE_QUALCOM_WIL6210
bool "Qualcom Atheros wil6210"

So I was about to rename and apply, but then I noticed something weird with the exiosting Atheros and Qualcom firmwares. We have:

config BR2_PACKAGE_LINUX_FIRMWARE_ATHEROS_10K_QCA6174
bool "Atheros 10k (QCA6174)"
help
Firmware files for the Atheros QCA6174 module

And:

config BR2_PACKAGE_LINUX_FIRMWARE_QUALCOMM_6174
bool "Qualcomm Atheros 6174"
help
Firmware files for the Qualcomm Atheros QCA6174 chip

And indeed they both installs files from ath10k/QCA6174: the former installs a selected set of files by name, while the latter installs the whole directory (using _FILES instaed of DIRS, at that).

Would wyou want to have a look amd fix that, then fix your patch and resummit, please?

Regards,
Yann E. MORIN.

Quoted 25 lines
package/linux-firmware/Config.in +3 -0
+	help
+	  Firmware files for Qualcomm Atheros 11ad family of chips
+
 endmenu
 
 menu "Ethernet firmware"
package/linux-firmware/linux-firmware.mk +5 -0
index 21300ddc72de..e553a2a06383 100644
@@ -373,6 +373,11 @@ LINUX_FIRMWARE_FILES += \
 LINUX_FIRMWARE_ALL_LICENSE_FILES += LICENCE.ti-connectivity
 endif
 
+ifeq ($(BR2_PACKAGE_LINUX_FIRMWARE_WILOCITY_WIL6210),y)
+LINUX_FIRMWARE_FILES += wil6210.*
+LINUX_FIRMWARE_ALL_LICENSE_FILES += LICENSE.QualcommAtheros_ath10k
+endif
+
 ifeq ($(BR2_PACKAGE_LINUX_FIRMWARE_IWLWIFI_3160),y)
 LINUX_FIRMWARE_FILES += iwlwifi-3160-*.ucode
 LINUX_FIRMWARE_ALL_LICENSE_FILES += LICENCE.iwlwifi_firmware
Signature · 1 line
2.25.1
Signature · 6 lines
.-----------------.--------------------.------------------.--------------------.
|  Yann E. MORIN  | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software  Designer | \ / CAMPAIGN     |  ___               |
| +33 561 099 427 `------------.-------:  X  AGAINST      |  \e/  There is no  |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL    |   v   conspiracy.  |
'------------------------------^-------^------------------^--------------------'
#2 lore raw

PATCH 1/1 package/linux-firmware: Add Wilocity 6210 11ad firmware

Hi Yann,

Quoted 24 lines · Yann E. MORIN

On 2020-03-30 17:31 +0300, Baruch Siach spake thusly:

Quoted 13 lines
Cc Yann E. MORIN <[email protected]>
Cc Yegor Yefremov <[email protected]>
---
 package/linux-firmware/Config.in         | 5 +++++
 package/linux-firmware/linux-firmware.mk | 5 +++++
 2 files changed, 10 insertions(+)
package/linux-firmware/Config.in +0 -0
index fb884842d66b..914b514f80bd 100644

package/linux-firmware/Config.in config BR2_PACKAGE_LINUX_FIRMWARE_TI_WL18XX · line 349

Quoted 5 lines
package/linux-firmware/Config.in +2 -0
@@ -345,6 +345,11 @@ config BR2_PACKAGE_LINUX_FIRMWARE_TI_WL18XX
 	help
 	  Firmware files for WLAN and Bluetooth modules wl18xx
 
+config BR2_PACKAGE_LINUX_FIRMWARE_WILOCITY_WIL6210
+	bool "Wilocity 6210"

I've been reminded recently that the options are all prefixed with the vendor, followed by the model name/number, so in this case, it should be:

Quoted 2 lines

config BR2_PACKAGE_LINUX_FIRMWARE_QUALCOM_WIL6210
bool "Qualcom Atheros wil6210"

Wilocity is arguably also the vendor name.

Quoted 15 lines

So I was about to rename and apply, but then I noticed something weird with the exiosting Atheros and Qualcom firmwares. We have:

config BR2_PACKAGE_LINUX_FIRMWARE_ATHEROS_10K_QCA6174
bool "Atheros 10k (QCA6174)"
help
Firmware files for the Atheros QCA6174 module

And:

config BR2_PACKAGE_LINUX_FIRMWARE_QUALCOMM_6174
bool "Qualcomm Atheros 6174"
help
Firmware files for the Qualcomm Atheros QCA6174 chip

Quoted 6 lines

And indeed they both installs files from ath10k/QCA6174: the former installs a selected set of files by name, while the latter installs the whole directory (using _FILES instaed of DIRS, at that).

Would wyou want to have a look amd fix that, then fix your patch and resummit, please?

How would you like to fix that? Should we drop BR2_PACKAGE_LINUX_FIRMWARE_ATHEROS_10K_QCA6174 option since it installs less files?

How is that related to this patch?

baruch

Quoted 22 lines
Quoted 22 lines
package/linux-firmware/Config.in +3 -0
+	help
+	  Firmware files for Qualcomm Atheros 11ad family of chips
+
 endmenu
 
 menu "Ethernet firmware"
package/linux-firmware/linux-firmware.mk +5 -0
index 21300ddc72de..e553a2a06383 100644
@@ -373,6 +373,11 @@ LINUX_FIRMWARE_FILES += \
 LINUX_FIRMWARE_ALL_LICENSE_FILES += LICENCE.ti-connectivity
 endif
 
+ifeq ($(BR2_PACKAGE_LINUX_FIRMWARE_WILOCITY_WIL6210),y)
+LINUX_FIRMWARE_FILES += wil6210.*
+LINUX_FIRMWARE_ALL_LICENSE_FILES += LICENSE.QualcommAtheros_ath10k
+endif
+
 ifeq ($(BR2_PACKAGE_LINUX_FIRMWARE_IWLWIFI_3160),y)
 LINUX_FIRMWARE_FILES += iwlwifi-3160-*.ucode
 LINUX_FIRMWARE_ALL_LICENSE_FILES += LICENCE.iwlwifi_firmware
Signature · 3 lines
     http://baruch.siach.name/blog/                  ~. .~   Tk Open Systems
=}------------------------------------------------ooO--U--Ooo------------{=
   - baruch at tkos.co.il - tel: +972.52.368.4656, http://www.tkos.co.il -