diff mbox series

package/linux-firmware: Add Intel WiFi 3945ABG/BG/4965AGN

Message ID e73a57b032c8683fa6f9f45a0cec62468742f5a5.1648829237.git.stefan@agner.ch
State Accepted
Headers show
Series package/linux-firmware: Add Intel WiFi 3945ABG/BG/4965AGN | expand

Commit Message

Stefan Agner April 1, 2022, 4:07 p.m. UTC
Add Intel WiFi 3945ABG/BG and 4965AGN firmware. This firmware is
required for the iwl4965 and iwl3945 kernel driver.

Signed-off-by: Stefan Agner <stefan@agner.ch>
---
 package/linux-firmware/Config.in         | 12 ++++++++++++
 package/linux-firmware/linux-firmware.mk | 10 ++++++++++
 2 files changed, 22 insertions(+)

Comments

Yann E. MORIN April 3, 2022, 7:12 p.m. UTC | #1
Stefan, All,

On 2022-04-01 18:07 +0200, Stefan Agner spake thusly:
> Add Intel WiFi 3945ABG/BG and 4965AGN firmware. This firmware is
> required for the iwl4965 and iwl3945 kernel driver.
> 
> Signed-off-by: Stefan Agner <stefan@agner.ch>
> ---
>  package/linux-firmware/Config.in         | 12 ++++++++++++
>  package/linux-firmware/linux-firmware.mk | 10 ++++++++++
>  2 files changed, 22 insertions(+)
> 
> diff --git a/package/linux-firmware/Config.in b/package/linux-firmware/Config.in
> index 4a44d4a2b6..a9a7e914cf 100644
> --- a/package/linux-firmware/Config.in
> +++ b/package/linux-firmware/Config.in
> @@ -199,6 +199,18 @@ config BR2_PACKAGE_LINUX_FIRMWARE_IWLWIFI_3168
>  	  Firmware files for the Intel Wifi 3168 devices supported by
>  	  the iwlwifi kernel driver.
>  
> +config BR2_PACKAGE_LINUX_FIRMWARE_IWLWIFI_3945
> +	bool "Intel iwlwifi 3945"
> +	help
> +	  Firmware files for the Intel Wifi 3945 devices supported by
> +	  the iwl4965 kernel driver.
             ^^^^
Here...

> +config BR2_PACKAGE_LINUX_FIRMWARE_IWLWIFI_4965
> +	bool "Intel iwlwifi 4965"
> +	help
> +	  Firmware files for the Intel Wifi 4965 devices supported by
> +	  the iwl3945 kernel driver.
             ^^^^
... and here, I guess there is an issue with the drivers names.

I've switched the two, and applied to master, thanks.

And I had to do a follow-up commit because I improperly fixed them...

Regards,
Yann E. MORIN.

> +
>  config BR2_PACKAGE_LINUX_FIRMWARE_IWLWIFI_5000
>  	bool "Intel iwlwifi 5000"
>  	help
> diff --git a/package/linux-firmware/linux-firmware.mk b/package/linux-firmware/linux-firmware.mk
> index 2eec8a291a..0c725737d0 100644
> --- a/package/linux-firmware/linux-firmware.mk
> +++ b/package/linux-firmware/linux-firmware.mk
> @@ -457,6 +457,16 @@ LINUX_FIRMWARE_FILES += iwlwifi-3168-*.ucode
>  LINUX_FIRMWARE_ALL_LICENSE_FILES += LICENCE.iwlwifi_firmware
>  endif
>  
> +ifeq ($(BR2_PACKAGE_LINUX_FIRMWARE_IWLWIFI_3945),y)
> +LINUX_FIRMWARE_FILES += iwlwifi-3945-2.ucode
> +LINUX_FIRMWARE_ALL_LICENSE_FILES += LICENCE.iwlwifi_firmware
> +endif
> +
> +ifeq ($(BR2_PACKAGE_LINUX_FIRMWARE_IWLWIFI_4965),y)
> +LINUX_FIRMWARE_FILES += iwlwifi-4965-2.ucode
> +LINUX_FIRMWARE_ALL_LICENSE_FILES += LICENCE.iwlwifi_firmware
> +endif
> +
>  # iwlwifi 5000. Multiple files are available (iwlwifi-5000-1.ucode,
>  # iwlwifi-5000-2.ucode, iwlwifi-5000-5.ucode), corresponding to
>  # different versions of the firmware API. For now, we only install the
> -- 
> 2.35.1
>
diff mbox series

Patch

diff --git a/package/linux-firmware/Config.in b/package/linux-firmware/Config.in
index 4a44d4a2b6..a9a7e914cf 100644
--- a/package/linux-firmware/Config.in
+++ b/package/linux-firmware/Config.in
@@ -199,6 +199,18 @@  config BR2_PACKAGE_LINUX_FIRMWARE_IWLWIFI_3168
 	  Firmware files for the Intel Wifi 3168 devices supported by
 	  the iwlwifi kernel driver.
 
+config BR2_PACKAGE_LINUX_FIRMWARE_IWLWIFI_3945
+	bool "Intel iwlwifi 3945"
+	help
+	  Firmware files for the Intel Wifi 3945 devices supported by
+	  the iwl4965 kernel driver.
+
+config BR2_PACKAGE_LINUX_FIRMWARE_IWLWIFI_4965
+	bool "Intel iwlwifi 4965"
+	help
+	  Firmware files for the Intel Wifi 4965 devices supported by
+	  the iwl3945 kernel driver.
+
 config BR2_PACKAGE_LINUX_FIRMWARE_IWLWIFI_5000
 	bool "Intel iwlwifi 5000"
 	help
diff --git a/package/linux-firmware/linux-firmware.mk b/package/linux-firmware/linux-firmware.mk
index 2eec8a291a..0c725737d0 100644
--- a/package/linux-firmware/linux-firmware.mk
+++ b/package/linux-firmware/linux-firmware.mk
@@ -457,6 +457,16 @@  LINUX_FIRMWARE_FILES += iwlwifi-3168-*.ucode
 LINUX_FIRMWARE_ALL_LICENSE_FILES += LICENCE.iwlwifi_firmware
 endif
 
+ifeq ($(BR2_PACKAGE_LINUX_FIRMWARE_IWLWIFI_3945),y)
+LINUX_FIRMWARE_FILES += iwlwifi-3945-2.ucode
+LINUX_FIRMWARE_ALL_LICENSE_FILES += LICENCE.iwlwifi_firmware
+endif
+
+ifeq ($(BR2_PACKAGE_LINUX_FIRMWARE_IWLWIFI_4965),y)
+LINUX_FIRMWARE_FILES += iwlwifi-4965-2.ucode
+LINUX_FIRMWARE_ALL_LICENSE_FILES += LICENCE.iwlwifi_firmware
+endif
+
 # iwlwifi 5000. Multiple files are available (iwlwifi-5000-1.ucode,
 # iwlwifi-5000-2.ucode, iwlwifi-5000-5.ucode), corresponding to
 # different versions of the firmware API. For now, we only install the