Re: [Buildroot] [PATCH 2/2] package/linux-firmware: add WiFi and BT firmware for MT7921 and MT7922

["Yann E. MORIN" <yann.morin.1998@free.fr>]

Jan, All,

On 2024-01-02 15:50 +0100, Jan Čermák spake thusly:
> Although similar in name, they use different kernel driver (with the
> exception of common Bluetooth driver, but the firmware file is quite
> large anyway, so it's worth having the possibility to be specific).
> 
> Signed-off-by: Jan Čermák <sairon@sairon.cz>
> ---
>  package/linux-firmware/Config.in         | 20 ++++++++++++++++++
>  package/linux-firmware/linux-firmware.mk | 26 ++++++++++++++++++++++++
>  2 files changed, 46 insertions(+)
> 
> diff --git a/package/linux-firmware/Config.in b/package/linux-firmware/Config.in
> index 1221a80984..8107f07b89 100644
> --- a/package/linux-firmware/Config.in
> +++ b/package/linux-firmware/Config.in
> @@ -59,6 +59,16 @@ config BR2_PACKAGE_LINUX_FIRMWARE_IBT
>  	  Firmware files for Intel 3160/7260/7265/8260/8265 Wireless
>  	  bluetooth support.
>  
> +config BR2_PACKAGE_LINUX_FIRMWARE_MT7921_BT
> +	bool "MediaTek MT7921"
> +	help
> +	  Firmware files for MediaTek MT7921 bluetooth support
> +
> +config BR2_PACKAGE_LINUX_FIRMWARE_MT7922_BT
> +	bool "MediaTek MT7922"
> +	help
> +	  Firmware files for MediaTek MT7922 bluetooth support

I've renamed the options to include "MEDIATEK" to match the following
option, and also reordered them after, too:

>  config BR2_PACKAGE_LINUX_FIRMWARE_MEDIATEK_MT7650
>  	bool "MediaTek MT7650"
>  	help
> @@ -383,6 +393,16 @@ config BR2_PACKAGE_LINUX_FIRMWARE_MEDIATEK_MT76X2E
>  	help
>  	  MediaTek MT76x2e
>  
> +config BR2_PACKAGE_LINUX_FIRMWARE_MEDIATEK_MT7921

Here, the WiFi-related options already had the "MEDIATEK" part, so the
BT ones were really standing apart without it.

> +	bool "MediaTek MT7921"
> +	help
> +	  MediaTek MT7921
> +
> +config BR2_PACKAGE_LINUX_FIRMWARE_MEDIATEK_MT7922
> +	bool "MediaTek MT7922"
> +	help
> +	  MediaTek MT7922
> +
>  config BR2_PACKAGE_LINUX_FIRMWARE_QUALCOMM_6174
>  	bool "Qualcomm Atheros 6174"
>  	help
> diff --git a/package/linux-firmware/linux-firmware.mk b/package/linux-firmware/linux-firmware.mk
> index d061c9f402..a6a138b3a3 100644
> --- a/package/linux-firmware/linux-firmware.mk
> +++ b/package/linux-firmware/linux-firmware.mk
> @@ -59,6 +59,18 @@ LINUX_FIRMWARE_FILES += intel/ibt-*
>  LINUX_FIRMWARE_ALL_LICENSE_FILES += LICENCE.ibt_firmware
>  endif
>  
> +# Mediatek MT7921 Bluetooth
> +ifeq ($(BR2_PACKAGE_LINUX_FIRMWARE_MT7921_BT),y)
> +LINUX_FIRMWARE_FILES += mediatek/BT_RAM_CODE_MT7961_1_2_hdr.bin
> +LINUX_FIRMWARE_ALL_LICENSE_FILES += LICENCE.mediatek
> +endif
> +
> +# Mediatek MT7922 Bluetooth
> +ifeq ($(BR2_PACKAGE_LINUX_FIRMWARE_MT7922_BT),y)
> +LINUX_FIRMWARE_FILES += mediatek/BT_RAM_CODE_MT7922_1_1_hdr.bin
> +LINUX_FIRMWARE_ALL_LICENSE_FILES += LICENCE.mediatek
> +endif

The ordering in the .mk is a bit loose, but there is some kind of
alphabetical ordering anyway, so I moved all the new Mediatek option
together with the existing BT one.

Also, there was no hash for the license file, so I added one. Please
check it on your side, to eb sure we get the same.

Applied to master with the above fixes , thanks.

Regards,
Yann E. MORIN.

>  # Qualcomm Atheros Rome 6174A Bluetooth
>  ifeq ($(BR2_PACKAGE_LINUX_FIRMWARE_QUALCOMM_6174A_BT),y)
>  LINUX_FIRMWARE_FILES += qca/rampatch_usb_00000302.bin qca/nvm_usb_00000302.bin
> @@ -382,6 +394,20 @@ LINUX_FIRMWARE_FILES += mediatek/mt7662.bin mediatek/mt7662_rom_patch.bin
>  LINUX_FIRMWARE_ALL_LICENSE_FILES += LICENCE.ralink_a_mediatek_company_firmware
>  endif
>  
> +# MT7921
> +ifeq ($(BR2_PACKAGE_LINUX_FIRMWARE_MEDIATEK_MT7921),y)
> +LINUX_FIRMWARE_FILES += mediatek/WIFI_MT7961_patch_mcu_1_2_hdr.bin \
> +			mediatek/WIFI_RAM_CODE_MT7961_1.bin
> +LINUX_FIRMWARE_ALL_LICENSE_FILES += LICENCE.mediatek
> +endif
> +
> +# MT7922
> +ifeq ($(BR2_PACKAGE_LINUX_FIRMWARE_MEDIATEK_MT7922),y)
> +LINUX_FIRMWARE_FILES += mediatek/WIFI_MT7922_patch_mcu_1_1_hdr.bin \
> +			mediatek/WIFI_RAM_CODE_MT7922_1.bin
> +LINUX_FIRMWARE_ALL_LICENSE_FILES += LICENCE.mediatek
> +endif
> +
>  # qca6174
>  ifeq ($(BR2_PACKAGE_LINUX_FIRMWARE_QUALCOMM_6174),y)
>  LINUX_FIRMWARE_FILES += ath10k/QCA6174
> -- 
> 2.34.1
> 
> _______________________________________________
> buildroot mailing list
> buildroot@buildroot.org
> https://lists.buildroot.org/mailman/listinfo/buildroot

-- 
.-----------------.--------------------.------------------.--------------------.
|  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.  |
'------------------------------^-------^------------------^--------------------'
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot