diff mbox series

[v2] linux-firmware: upgrade 20250109 -> 20250211

Message ID 20250212174726.1533501-1-quic_vpuar@quicinc.com
State Accepted, archived
Commit 6148a282509106879388138fe682721d07968452
Headers show
Series [v2] linux-firmware: upgrade 20250109 -> 20250211 | expand

Commit Message

Vivek Puar Feb. 12, 2025, 5:47 p.m. UTC
Add DSP firmware for Qualcomm SA8775P / QCS9100
platforms to ${PN}-qcom-sa8775p-{audio, compute, generalpurpose}
packages, and updating it with correct license information.

Add QCA6698AQ package ${PN}-ath11k-qca6698aq
to ath11k firmware.

Add bluetooth WCN3950 package ${PN}-qca-wcn3950
to qca firmware.

License-Update: additional files

Signed-off-by: Vivek Puar <quic_vpuar@quicinc.com>
Cc: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
---
 ...20250109.bb => linux-firmware_20250211.bb} | 36 ++++++++++++++++---
 1 file changed, 32 insertions(+), 4 deletions(-)
 rename meta/recipes-kernel/linux-firmware/{linux-firmware_20250109.bb => linux-firmware_20250211.bb} (98%)

Comments

Dmitry Baryshkov Feb. 12, 2025, 8:23 p.m. UTC | #1
On Wed, Feb 12, 2025 at 11:17:26PM +0530, Vivek Puar wrote:
> Add DSP firmware for Qualcomm SA8775P / QCS9100
> platforms to ${PN}-qcom-sa8775p-{audio, compute, generalpurpose}
> packages, and updating it with correct license information.
> 
> Add QCA6698AQ package ${PN}-ath11k-qca6698aq
> to ath11k firmware.
> 
> Add bluetooth WCN3950 package ${PN}-qca-wcn3950
> to qca firmware.

You've missed several other files:

$ dpkg-deb -c tmp-rpb/deploy/ipk/all/linux-firmware_20250211-r0_all.ipk | grep qcom
drwxr-xr-x root/root         0 2025-02-10 14:55 ./usr/lib/firmware/qcom/
drwxr-xr-x root/root         0 2025-02-10 14:55 ./usr/lib/firmware/qcom/qcm6490/
lrwxrwxrwx root/root         0 2025-02-10 14:55 ./usr/lib/firmware/qcom/qcm6490/wpss.mbn -> ../../ath11k/WCN6750/hw1.0/qcm6490/wpss.mbn
drwxr-xr-x root/root         0 2025-02-10 14:55 ./usr/lib/firmware/qcom/qcs6490/
lrwxrwxrwx root/root         0 2025-02-10 14:55 ./usr/lib/firmware/qcom/qcs6490/wpss.mbn -> ../../ath11k/WCN6750/hw1.0/qcm6490/wpss.mbn
drwxr-xr-x root/root         0 2025-02-10 14:55 ./usr/lib/firmware/qcom/x1e80100/
drwxr-xr-x root/root         0 2025-02-10 14:55 ./usr/lib/firmware/qcom/x1e80100/LENOVO/
drwxr-xr-x root/root         0 2025-02-10 14:55 ./usr/lib/firmware/qcom/x1e80100/LENOVO/21N1/
-rw-r--r-- root/root     73528 2025-02-10 14:55 ./usr/lib/firmware/qcom/x1e80100/LENOVO/21N1/adsp_dtbs.elf
-rw-r--r-- root/root       697 2025-02-10 14:55 ./usr/lib/firmware/qcom/x1e80100/LENOVO/21N1/adspr.jsn
-rw-r--r-- root/root       536 2025-02-10 14:55 ./usr/lib/firmware/qcom/x1e80100/LENOVO/21N1/adsps.jsn
-rw-r--r-- root/root       731 2025-02-10 14:55 ./usr/lib/firmware/qcom/x1e80100/LENOVO/21N1/adspua.jsn
-rw-r--r-- root/root       537 2025-02-10 14:55 ./usr/lib/firmware/qcom/x1e80100/LENOVO/21N1/battmgr.jsn
-rw-r--r-- root/root     40760 2025-02-10 14:55 ./usr/lib/firmware/qcom/x1e80100/LENOVO/21N1/cdsp_dtbs.elf
-rw-r--r-- root/root       534 2025-02-10 14:55 ./usr/lib/firmware/qcom/x1e80100/LENOVO/21N1/cdspr.jsn
-rw-r--r-- root/root  22043064 2025-02-10 14:55 ./usr/lib/firmware/qcom/x1e80100/LENOVO/21N1/qcadsp8380.mbn
-rw-r--r-- root/root   3072424 2025-02-10 14:55 ./usr/lib/firmware/qcom/x1e80100/LENOVO/21N1/qccdsp8380.mbn
-rw-r--r-- root/root     12088 2025-02-10 14:55 ./usr/lib/firmware/qcom/x1e80100/LENOVO/21N1/qcdxkmsuc8380.mbn

$ dpkg-deb -c tmp-rpb/deploy/ipk/all/linux-firmware-qca-misc_20250211-r0_all.ipk
drwxr-xr-x root/root         0 2025-02-10 14:55 ./usr/
drwxr-xr-x root/root         0 2025-02-10 14:55 ./usr/lib/
drwxr-xr-x root/root         0 2025-02-10 14:55 ./usr/lib/firmware/
drwxr-xr-x root/root         0 2025-02-10 14:55 ./usr/lib/firmware/qca/
drwxr-xr-x root/root         0 2025-02-10 14:55 ./usr/lib/firmware/qca/QCA6698/
-rw-r--r-- root/root    161716 2025-02-10 14:55 ./usr/lib/firmware/qca/QCA6698/hpbtfw21.tlv
-rw-r--r-- root/root      6614 2025-02-10 14:55 ./usr/lib/firmware/qca/QCA6698/hpnv21.b206
-rw-r--r-- root/root      6702 2025-02-10 14:55 ./usr/lib/firmware/qca/QCA6698/hpnv21.b207
-rw-r--r-- root/root      6614 2025-02-10 14:55 ./usr/lib/firmware/qca/QCA6698/hpnv21.bin
-rw-r--r-- root/root      1641 2025-02-10 14:55 ./usr/lib/firmware/qca/cmnv13s.bin
-rw-r--r-- root/root      1641 2025-02-10 14:55 ./usr/lib/firmware/qca/cmnv13t.bin

> 
> License-Update: additional files
> 
> Signed-off-by: Vivek Puar <quic_vpuar@quicinc.com>
> Cc: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
> ---
>  ...20250109.bb => linux-firmware_20250211.bb} | 36 ++++++++++++++++---
>  1 file changed, 32 insertions(+), 4 deletions(-)
>  rename meta/recipes-kernel/linux-firmware/{linux-firmware_20250109.bb => linux-firmware_20250211.bb} (98%)
> 
> diff --git a/meta/recipes-kernel/linux-firmware/linux-firmware_20250109.bb b/meta/recipes-kernel/linux-firmware/linux-firmware_20250211.bb
> similarity index 98%
> rename from meta/recipes-kernel/linux-firmware/linux-firmware_20250109.bb
> rename to meta/recipes-kernel/linux-firmware/linux-firmware_20250211.bb
> index b932300742..e3a29a284f 100644
> --- a/meta/recipes-kernel/linux-firmware/linux-firmware_20250109.bb
> +++ b/meta/recipes-kernel/linux-firmware/linux-firmware_20250211.bb
> @@ -55,6 +55,7 @@ LICENSE = "\
>      & Firmware-powervr \
>      & Firmware-qat \
>      & Firmware-qcom \
> +    & Firmware-qcom-2 \
>      & Firmware-qcom-yamato \
>      & Firmware-qla1280 \
>      & Firmware-qla2xxx \
> @@ -132,6 +133,7 @@ LIC_FILES_CHKSUM = "file://LICENCE.Abilis;md5=b5ee3f410780e56711ad48eadc22b8bc \
>                      file://LICENSE.powervr;md5=83045ed2a2cda15b4eaff682c98c9533 \
>                      file://LICENCE.qat_firmware;md5=72de83dfd9b87be7685ed099a39fbea4 \
>                      file://LICENSE.qcom;md5=164e3362a538eb11d3ac51e8e134294b \
> +                    file://LICENSE.qcom-2;md5=165287851294f2fb8ac8cbc5e24b02b0 \
>                      file://LICENSE.qcom_yamato;md5=d0de0eeccaf1843a850bf7a6777eec5c \
>                      file://LICENCE.qla1280;md5=d6895732e622d950609093223a2c4f5d \
>                      file://LICENCE.qla2xxx;md5=505855e921b75f1be4a437ad9b79dff0 \
> @@ -158,7 +160,7 @@ LIC_FILES_CHKSUM = "file://LICENCE.Abilis;md5=b5ee3f410780e56711ad48eadc22b8bc \
>                      "
>  # WHENCE checksum is defined separately to ease overriding it if
>  # class-devupstream is selected.
> -WHENCE_CHKSUM  = "c90a25ccbd027eb8d61b2943ab68447c"
> +WHENCE_CHKSUM  = "65c2919e6511a0d348a009ac419375b7"
>  
>  # These are not common licenses, set NO_GENERIC_LICENSE for them
>  # so that the license files will be copied from fetched source
> @@ -212,6 +214,7 @@ NO_GENERIC_LICENSE[Firmware-phanfw] = "LICENCE.phanfw"
>  NO_GENERIC_LICENSE[Firmware-powervr] = "LICENSE.powervr"
>  NO_GENERIC_LICENSE[Firmware-qat] = "LICENCE.qat_firmware"
>  NO_GENERIC_LICENSE[Firmware-qcom] = "LICENSE.qcom"
> +NO_GENERIC_LICENSE[Firmware-qcom-2] = "LICENSE.qcom-2"
>  NO_GENERIC_LICENSE[Firmware-qcom-yamato] = "LICENSE.qcom_yamato"
>  NO_GENERIC_LICENSE[Firmware-qla1280] = "LICENCE.qla1280"
>  NO_GENERIC_LICENSE[Firmware-qla2xxx] = "LICENCE.qla2xxx"
> @@ -247,7 +250,7 @@ SRC_URI:class-devupstream = "git://git.kernel.org/pub/scm/linux/kernel/git/firmw
>  # Pin this to the 20220509 release, override this in local.conf
>  SRCREV:class-devupstream ?= "b19cbdca78ab2adfd210c91be15a22568e8b8cae"
>  
> -SRC_URI[sha256sum] = "a12cb38f4793394bf56c6702be29b6e4f09deca0714943bba98a492030651570"
> +SRC_URI[sha256sum] = "2de1345897bf839d532c5de0fdb348770ca2a5f4edfb21971582597abb45297d" 

Applying: linux-firmware: upgrade 20250109 -> 20250211
<PATH>/layers/openembedded-core/.git/rebase-apply/patch:51: trailing whitespace.
SRC_URI[sha256sum] = "2de1345897bf839d532c5de0fdb348770ca2a5f4edfb21971582597abb45297d"

>  
>  inherit allarch
>
Vivek Puar Feb. 13, 2025, 2:41 a.m. UTC | #2
On 2/13/2025 1:53 AM, Dmitry Baryshkov wrote:

> On Wed, Feb 12, 2025 at 11:17:26PM +0530, Vivek Puar wrote:
>> Add DSP firmware for Qualcomm SA8775P / QCS9100
>> platforms to ${PN}-qcom-sa8775p-{audio, compute, generalpurpose}
>> packages, and updating it with correct license information.
>>
>> Add QCA6698AQ package ${PN}-ath11k-qca6698aq
>> to ath11k firmware.
>>
>> Add bluetooth WCN3950 package ${PN}-qca-wcn3950
>> to qca firmware.
> You've missed several other files:
>
> $ dpkg-deb -c tmp-rpb/deploy/ipk/all/linux-firmware_20250211-r0_all.ipk | grep qcom
> drwxr-xr-x root/root         0 2025-02-10 14:55 ./usr/lib/firmware/qcom/
> drwxr-xr-x root/root         0 2025-02-10 14:55 ./usr/lib/firmware/qcom/qcm6490/
> lrwxrwxrwx root/root         0 2025-02-10 14:55 ./usr/lib/firmware/qcom/qcm6490/wpss.mbn -> ../../ath11k/WCN6750/hw1.0/qcm6490/wpss.mbn
> drwxr-xr-x root/root         0 2025-02-10 14:55 ./usr/lib/firmware/qcom/qcs6490/
> lrwxrwxrwx root/root         0 2025-02-10 14:55 ./usr/lib/firmware/qcom/qcs6490/wpss.mbn -> ../../ath11k/WCN6750/hw1.0/qcm6490/wpss.mbn
> drwxr-xr-x root/root         0 2025-02-10 14:55 ./usr/lib/firmware/qcom/x1e80100/
> drwxr-xr-x root/root         0 2025-02-10 14:55 ./usr/lib/firmware/qcom/x1e80100/LENOVO/
> drwxr-xr-x root/root         0 2025-02-10 14:55 ./usr/lib/firmware/qcom/x1e80100/LENOVO/21N1/
> -rw-r--r-- root/root     73528 2025-02-10 14:55 ./usr/lib/firmware/qcom/x1e80100/LENOVO/21N1/adsp_dtbs.elf
> -rw-r--r-- root/root       697 2025-02-10 14:55 ./usr/lib/firmware/qcom/x1e80100/LENOVO/21N1/adspr.jsn
> -rw-r--r-- root/root       536 2025-02-10 14:55 ./usr/lib/firmware/qcom/x1e80100/LENOVO/21N1/adsps.jsn
> -rw-r--r-- root/root       731 2025-02-10 14:55 ./usr/lib/firmware/qcom/x1e80100/LENOVO/21N1/adspua.jsn
> -rw-r--r-- root/root       537 2025-02-10 14:55 ./usr/lib/firmware/qcom/x1e80100/LENOVO/21N1/battmgr.jsn
> -rw-r--r-- root/root     40760 2025-02-10 14:55 ./usr/lib/firmware/qcom/x1e80100/LENOVO/21N1/cdsp_dtbs.elf
> -rw-r--r-- root/root       534 2025-02-10 14:55 ./usr/lib/firmware/qcom/x1e80100/LENOVO/21N1/cdspr.jsn
> -rw-r--r-- root/root  22043064 2025-02-10 14:55 ./usr/lib/firmware/qcom/x1e80100/LENOVO/21N1/qcadsp8380.mbn
> -rw-r--r-- root/root   3072424 2025-02-10 14:55 ./usr/lib/firmware/qcom/x1e80100/LENOVO/21N1/qccdsp8380.mbn
> -rw-r--r-- root/root     12088 2025-02-10 14:55 ./usr/lib/firmware/qcom/x1e80100/LENOVO/21N1/qcdxkmsuc8380.mbn
>
> $ dpkg-deb -c tmp-rpb/deploy/ipk/all/linux-firmware-qca-misc_20250211-r0_all.ipk
> drwxr-xr-x root/root         0 2025-02-10 14:55 ./usr/
> drwxr-xr-x root/root         0 2025-02-10 14:55 ./usr/lib/
> drwxr-xr-x root/root         0 2025-02-10 14:55 ./usr/lib/firmware/
> drwxr-xr-x root/root         0 2025-02-10 14:55 ./usr/lib/firmware/qca/
> drwxr-xr-x root/root         0 2025-02-10 14:55 ./usr/lib/firmware/qca/QCA6698/
> -rw-r--r-- root/root    161716 2025-02-10 14:55 ./usr/lib/firmware/qca/QCA6698/hpbtfw21.tlv
> -rw-r--r-- root/root      6614 2025-02-10 14:55 ./usr/lib/firmware/qca/QCA6698/hpnv21.b206
> -rw-r--r-- root/root      6702 2025-02-10 14:55 ./usr/lib/firmware/qca/QCA6698/hpnv21.b207
> -rw-r--r-- root/root      6614 2025-02-10 14:55 ./usr/lib/firmware/qca/QCA6698/hpnv21.bin
> -rw-r--r-- root/root      1641 2025-02-10 14:55 ./usr/lib/firmware/qca/cmnv13s.bin
> -rw-r--r-- root/root      1641 2025-02-10 14:55 ./usr/lib/firmware/qca/cmnv13t.bin
Will add these files.
>> License-Update: additional files
>>
>> Signed-off-by: Vivek Puar<quic_vpuar@quicinc.com>
>> Cc: Dmitry Baryshkov<dmitry.baryshkov@linaro.org>
>> ---
>>   ...20250109.bb => linux-firmware_20250211.bb} | 36 ++++++++++++++++---
>>   1 file changed, 32 insertions(+), 4 deletions(-)
>>   rename meta/recipes-kernel/linux-firmware/{linux-firmware_20250109.bb => linux-firmware_20250211.bb} (98%)
>>
>> diff --git a/meta/recipes-kernel/linux-firmware/linux-firmware_20250109.bb b/meta/recipes-kernel/linux-firmware/linux-firmware_20250211.bb
>> similarity index 98%
>> rename from meta/recipes-kernel/linux-firmware/linux-firmware_20250109.bb
>> rename to meta/recipes-kernel/linux-firmware/linux-firmware_20250211.bb
>> index b932300742..e3a29a284f 100644
>> --- a/meta/recipes-kernel/linux-firmware/linux-firmware_20250109.bb
>> +++ b/meta/recipes-kernel/linux-firmware/linux-firmware_20250211.bb
>> @@ -55,6 +55,7 @@ LICENSE = "\
>>       & Firmware-powervr \
>>       & Firmware-qat \
>>       & Firmware-qcom \
>> +    & Firmware-qcom-2 \
>>       & Firmware-qcom-yamato \
>>       & Firmware-qla1280 \
>>       & Firmware-qla2xxx \
>> @@ -132,6 +133,7 @@ LIC_FILES_CHKSUM ="file://LICENCE.Abilis;md5=b5ee3f410780e56711ad48eadc22b8bc \ 
>> file://LICENSE.powervr;md5=83045ed2a2cda15b4eaff682c98c9533 \ 
>> file://LICENCE.qat_firmware;md5=72de83dfd9b87be7685ed099a39fbea4 \ 
>> file://LICENSE.qcom;md5=164e3362a538eb11d3ac51e8e134294b \ + 
>> file://LICENSE.qcom-2;md5=165287851294f2fb8ac8cbc5e24b02b0 \ 
>> file://LICENSE.qcom_yamato;md5=d0de0eeccaf1843a850bf7a6777eec5c \ 
>> file://LICENCE.qla1280;md5=d6895732e622d950609093223a2c4f5d \ 
>> file://LICENCE.qla2xxx;md5=505855e921b75f1be4a437ad9b79dff0 \ @@ 
>> -158,7 +160,7 @@ LIC_FILES_CHKSUM = "file://LICENCE.Abilis;md5=b5ee3f410780e56711ad48eadc22b8bc \
>>                       "
>>   # WHENCE checksum is defined separately to ease overriding it if
>>   # class-devupstream is selected.
>> -WHENCE_CHKSUM  = "c90a25ccbd027eb8d61b2943ab68447c"
>> +WHENCE_CHKSUM  = "65c2919e6511a0d348a009ac419375b7"
>>   
>>   # These are not common licenses, set NO_GENERIC_LICENSE for them
>>   # so that the license files will be copied from fetched source
>> @@ -212,6 +214,7 @@ NO_GENERIC_LICENSE[Firmware-phanfw] = "LICENCE.phanfw"
>>   NO_GENERIC_LICENSE[Firmware-powervr] = "LICENSE.powervr"
>>   NO_GENERIC_LICENSE[Firmware-qat] = "LICENCE.qat_firmware"
>>   NO_GENERIC_LICENSE[Firmware-qcom] = "LICENSE.qcom"
>> +NO_GENERIC_LICENSE[Firmware-qcom-2] = "LICENSE.qcom-2"
>>   NO_GENERIC_LICENSE[Firmware-qcom-yamato] = "LICENSE.qcom_yamato"
>>   NO_GENERIC_LICENSE[Firmware-qla1280] = "LICENCE.qla1280"
>>   NO_GENERIC_LICENSE[Firmware-qla2xxx] = "LICENCE.qla2xxx"
>> @@ -247,7 +250,7 @@ SRC_URI:class-devupstream = "git://git.kernel.org/pub/scm/linux/kernel/git/firmw
>>   # Pin this to the 20220509 release, override this in local.conf
>>   SRCREV:class-devupstream ?= "b19cbdca78ab2adfd210c91be15a22568e8b8cae"
>>   
>> -SRC_URI[sha256sum] = "a12cb38f4793394bf56c6702be29b6e4f09deca0714943bba98a492030651570"
>> +SRC_URI[sha256sum] = "2de1345897bf839d532c5de0fdb348770ca2a5f4edfb21971582597abb45297d"
> Applying: linux-firmware: upgrade 20250109 -> 20250211
> <PATH>/layers/openembedded-core/.git/rebase-apply/patch:51: trailing whitespace.
> SRC_URI[sha256sum] = "2de1345897bf839d532c5de0fdb348770ca2a5f4edfb21971582597abb45297d"
Will remove these whitespace warning.
>>   
>>   inherit allarch
>>   
Regards,
Vivek
Dmitry Baryshkov Feb. 13, 2025, 2:46 a.m. UTC | #3
On Thu, 13 Feb 2025 at 04:41, Vivek Puar <quic_vpuar@quicinc.com> wrote:

Please don't ever compose or send HTML email to the public mailing
lists. Your response has killed all quotation levels.

>
> On 2/13/2025 1:53 AM, Dmitry Baryshkov wrote:
>
> On Wed, Feb 12, 2025 at 11:17:26PM +0530, Vivek Puar wrote:
>
> Add DSP firmware for Qualcomm SA8775P / QCS9100
> platforms to ${PN}-qcom-sa8775p-{audio, compute, generalpurpose}
> packages, and updating it with correct license information.
>
> Add QCA6698AQ package ${PN}-ath11k-qca6698aq
> to ath11k firmware.
>
> Add bluetooth WCN3950 package ${PN}-qca-wcn3950
> to qca firmware.
>
> You've missed several other files:
>
> $ dpkg-deb -c tmp-rpb/deploy/ipk/all/linux-firmware_20250211-r0_all.ipk | grep qcom
> drwxr-xr-x root/root         0 2025-02-10 14:55 ./usr/lib/firmware/qcom/
> drwxr-xr-x root/root         0 2025-02-10 14:55 ./usr/lib/firmware/qcom/qcm6490/
> lrwxrwxrwx root/root         0 2025-02-10 14:55 ./usr/lib/firmware/qcom/qcm6490/wpss.mbn -> ../../ath11k/WCN6750/hw1.0/qcm6490/wpss.mbn
> drwxr-xr-x root/root         0 2025-02-10 14:55 ./usr/lib/firmware/qcom/qcs6490/
> lrwxrwxrwx root/root         0 2025-02-10 14:55 ./usr/lib/firmware/qcom/qcs6490/wpss.mbn -> ../../ath11k/WCN6750/hw1.0/qcm6490/wpss.mbn

These two files should go to linux-firmware-qcom-qcm6490-wifi package.

> drwxr-xr-x root/root         0 2025-02-10 14:55 ./usr/lib/firmware/qcom/x1e80100/
> drwxr-xr-x root/root         0 2025-02-10 14:55 ./usr/lib/firmware/qcom/x1e80100/LENOVO/
> drwxr-xr-x root/root         0 2025-02-10 14:55 ./usr/lib/firmware/qcom/x1e80100/LENOVO/21N1/
> -rw-r--r-- root/root     73528 2025-02-10 14:55 ./usr/lib/firmware/qcom/x1e80100/LENOVO/21N1/adsp_dtbs.elf
> -rw-r--r-- root/root       697 2025-02-10 14:55 ./usr/lib/firmware/qcom/x1e80100/LENOVO/21N1/adspr.jsn
> -rw-r--r-- root/root       536 2025-02-10 14:55 ./usr/lib/firmware/qcom/x1e80100/LENOVO/21N1/adsps.jsn
> -rw-r--r-- root/root       731 2025-02-10 14:55 ./usr/lib/firmware/qcom/x1e80100/LENOVO/21N1/adspua.jsn
> -rw-r--r-- root/root       537 2025-02-10 14:55 ./usr/lib/firmware/qcom/x1e80100/LENOVO/21N1/battmgr.jsn
> -rw-r--r-- root/root     40760 2025-02-10 14:55 ./usr/lib/firmware/qcom/x1e80100/LENOVO/21N1/cdsp_dtbs.elf
> -rw-r--r-- root/root       534 2025-02-10 14:55 ./usr/lib/firmware/qcom/x1e80100/LENOVO/21N1/cdspr.jsn
> -rw-r--r-- root/root  22043064 2025-02-10 14:55 ./usr/lib/firmware/qcom/x1e80100/LENOVO/21N1/qcadsp8380.mbn
> -rw-r--r-- root/root   3072424 2025-02-10 14:55 ./usr/lib/firmware/qcom/x1e80100/LENOVO/21N1/qccdsp8380.mbn
> -rw-r--r-- root/root     12088 2025-02-10 14:55 ./usr/lib/firmware/qcom/x1e80100/LENOVO/21N1/qcdxkmsuc8380.mbn

And these files belong to 'Lenovo T14 G6'. They should be handled in a
way similar to the existing Lenovo X13s packages.

>
> $ dpkg-deb -c tmp-rpb/deploy/ipk/all/linux-firmware-qca-misc_20250211-r0_all.ipk
> drwxr-xr-x root/root         0 2025-02-10 14:55 ./usr/
> drwxr-xr-x root/root         0 2025-02-10 14:55 ./usr/lib/
> drwxr-xr-x root/root         0 2025-02-10 14:55 ./usr/lib/firmware/
> drwxr-xr-x root/root         0 2025-02-10 14:55 ./usr/lib/firmware/qca/
> drwxr-xr-x root/root         0 2025-02-10 14:55 ./usr/lib/firmware/qca/QCA6698/
> -rw-r--r-- root/root    161716 2025-02-10 14:55 ./usr/lib/firmware/qca/QCA6698/hpbtfw21.tlv
> -rw-r--r-- root/root      6614 2025-02-10 14:55 ./usr/lib/firmware/qca/QCA6698/hpnv21.b206
> -rw-r--r-- root/root      6702 2025-02-10 14:55 ./usr/lib/firmware/qca/QCA6698/hpnv21.b207
> -rw-r--r-- root/root      6614 2025-02-10 14:55 ./usr/lib/firmware/qca/QCA6698/hpnv21.bin
> -rw-r--r-- root/root      1641 2025-02-10 14:55 ./usr/lib/firmware/qca/cmnv13s.bin
> -rw-r--r-- root/root      1641 2025-02-10 14:55 ./usr/lib/firmware/qca/cmnv13t.bin
>
> Will add these files.

Thanks!

>
> License-Update: additional files
>
> Signed-off-by: Vivek Puar <quic_vpuar@quicinc.com>
> Cc: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
> ---
>  ...20250109.bb => linux-firmware_20250211.bb} | 36 ++++++++++++++++---
>  1 file changed, 32 insertions(+), 4 deletions(-)
>  rename meta/recipes-kernel/linux-firmware/{linux-firmware_20250109.bb => linux-firmware_20250211.bb} (98%)
>
> diff --git a/meta/recipes-kernel/linux-firmware/linux-firmware_20250109.bb b/meta/recipes-kernel/linux-firmware/linux-firmware_20250211.bb
> similarity index 98%
> rename from meta/recipes-kernel/linux-firmware/linux-firmware_20250109.bb
> rename to meta/recipes-kernel/linux-firmware/linux-firmware_20250211.bb
> index b932300742..e3a29a284f 100644
> --- a/meta/recipes-kernel/linux-firmware/linux-firmware_20250109.bb
> +++ b/meta/recipes-kernel/linux-firmware/linux-firmware_20250211.bb
> @@ -55,6 +55,7 @@ LICENSE = "\
>      & Firmware-powervr \
>      & Firmware-qat \
>      & Firmware-qcom \
> +    & Firmware-qcom-2 \
>      & Firmware-qcom-yamato \
>      & Firmware-qla1280 \
>      & Firmware-qla2xxx \
> @@ -132,6 +133,7 @@ LIC_FILES_CHKSUM = "file://LICENCE.Abilis;md5=b5ee3f410780e56711ad48eadc22b8bc \
>                      file://LICENSE.powervr;md5=83045ed2a2cda15b4eaff682c98c9533 \
>                      file://LICENCE.qat_firmware;md5=72de83dfd9b87be7685ed099a39fbea4 \
>                      file://LICENSE.qcom;md5=164e3362a538eb11d3ac51e8e134294b \
> +                    file://LICENSE.qcom-2;md5=165287851294f2fb8ac8cbc5e24b02b0 \
>                      file://LICENSE.qcom_yamato;md5=d0de0eeccaf1843a850bf7a6777eec5c \
>                      file://LICENCE.qla1280;md5=d6895732e622d950609093223a2c4f5d \
>                      file://LICENCE.qla2xxx;md5=505855e921b75f1be4a437ad9b79dff0 \
> @@ -158,7 +160,7 @@ LIC_FILES_CHKSUM = "file://LICENCE.Abilis;md5=b5ee3f410780e56711ad48eadc22b8bc \
>                      "
>  # WHENCE checksum is defined separately to ease overriding it if
>  # class-devupstream is selected.
> -WHENCE_CHKSUM  = "c90a25ccbd027eb8d61b2943ab68447c"
> +WHENCE_CHKSUM  = "65c2919e6511a0d348a009ac419375b7"
>
>  # These are not common licenses, set NO_GENERIC_LICENSE for them
>  # so that the license files will be copied from fetched source
> @@ -212,6 +214,7 @@ NO_GENERIC_LICENSE[Firmware-phanfw] = "LICENCE.phanfw"
>  NO_GENERIC_LICENSE[Firmware-powervr] = "LICENSE.powervr"
>  NO_GENERIC_LICENSE[Firmware-qat] = "LICENCE.qat_firmware"
>  NO_GENERIC_LICENSE[Firmware-qcom] = "LICENSE.qcom"
> +NO_GENERIC_LICENSE[Firmware-qcom-2] = "LICENSE.qcom-2"
>  NO_GENERIC_LICENSE[Firmware-qcom-yamato] = "LICENSE.qcom_yamato"
>  NO_GENERIC_LICENSE[Firmware-qla1280] = "LICENCE.qla1280"
>  NO_GENERIC_LICENSE[Firmware-qla2xxx] = "LICENCE.qla2xxx"
> @@ -247,7 +250,7 @@ SRC_URI:class-devupstream = "git://git.kernel.org/pub/scm/linux/kernel/git/firmw
>  # Pin this to the 20220509 release, override this in local.conf
>  SRCREV:class-devupstream ?= "b19cbdca78ab2adfd210c91be15a22568e8b8cae"
>
> -SRC_URI[sha256sum] = "a12cb38f4793394bf56c6702be29b6e4f09deca0714943bba98a492030651570"
> +SRC_URI[sha256sum] = "2de1345897bf839d532c5de0fdb348770ca2a5f4edfb21971582597abb45297d"
>
> Applying: linux-firmware: upgrade 20250109 -> 20250211
> <PATH>/layers/openembedded-core/.git/rebase-apply/patch:51: trailing whitespace.
> SRC_URI[sha256sum] = "2de1345897bf839d532c5de0fdb348770ca2a5f4edfb21971582597abb45297d"
>
> Will remove these whitespace warning.
>
>
>  inherit allarch
>
>
> Regards,
> Vivek
diff mbox series

Patch

diff --git a/meta/recipes-kernel/linux-firmware/linux-firmware_20250109.bb b/meta/recipes-kernel/linux-firmware/linux-firmware_20250211.bb
similarity index 98%
rename from meta/recipes-kernel/linux-firmware/linux-firmware_20250109.bb
rename to meta/recipes-kernel/linux-firmware/linux-firmware_20250211.bb
index b932300742..e3a29a284f 100644
--- a/meta/recipes-kernel/linux-firmware/linux-firmware_20250109.bb
+++ b/meta/recipes-kernel/linux-firmware/linux-firmware_20250211.bb
@@ -55,6 +55,7 @@  LICENSE = "\
     & Firmware-powervr \
     & Firmware-qat \
     & Firmware-qcom \
+    & Firmware-qcom-2 \
     & Firmware-qcom-yamato \
     & Firmware-qla1280 \
     & Firmware-qla2xxx \
@@ -132,6 +133,7 @@  LIC_FILES_CHKSUM = "file://LICENCE.Abilis;md5=b5ee3f410780e56711ad48eadc22b8bc \
                     file://LICENSE.powervr;md5=83045ed2a2cda15b4eaff682c98c9533 \
                     file://LICENCE.qat_firmware;md5=72de83dfd9b87be7685ed099a39fbea4 \
                     file://LICENSE.qcom;md5=164e3362a538eb11d3ac51e8e134294b \
+                    file://LICENSE.qcom-2;md5=165287851294f2fb8ac8cbc5e24b02b0 \
                     file://LICENSE.qcom_yamato;md5=d0de0eeccaf1843a850bf7a6777eec5c \
                     file://LICENCE.qla1280;md5=d6895732e622d950609093223a2c4f5d \
                     file://LICENCE.qla2xxx;md5=505855e921b75f1be4a437ad9b79dff0 \
@@ -158,7 +160,7 @@  LIC_FILES_CHKSUM = "file://LICENCE.Abilis;md5=b5ee3f410780e56711ad48eadc22b8bc \
                     "
 # WHENCE checksum is defined separately to ease overriding it if
 # class-devupstream is selected.
-WHENCE_CHKSUM  = "c90a25ccbd027eb8d61b2943ab68447c"
+WHENCE_CHKSUM  = "65c2919e6511a0d348a009ac419375b7"
 
 # These are not common licenses, set NO_GENERIC_LICENSE for them
 # so that the license files will be copied from fetched source
@@ -212,6 +214,7 @@  NO_GENERIC_LICENSE[Firmware-phanfw] = "LICENCE.phanfw"
 NO_GENERIC_LICENSE[Firmware-powervr] = "LICENSE.powervr"
 NO_GENERIC_LICENSE[Firmware-qat] = "LICENCE.qat_firmware"
 NO_GENERIC_LICENSE[Firmware-qcom] = "LICENSE.qcom"
+NO_GENERIC_LICENSE[Firmware-qcom-2] = "LICENSE.qcom-2"
 NO_GENERIC_LICENSE[Firmware-qcom-yamato] = "LICENSE.qcom_yamato"
 NO_GENERIC_LICENSE[Firmware-qla1280] = "LICENCE.qla1280"
 NO_GENERIC_LICENSE[Firmware-qla2xxx] = "LICENCE.qla2xxx"
@@ -247,7 +250,7 @@  SRC_URI:class-devupstream = "git://git.kernel.org/pub/scm/linux/kernel/git/firmw
 # Pin this to the 20220509 release, override this in local.conf
 SRCREV:class-devupstream ?= "b19cbdca78ab2adfd210c91be15a22568e8b8cae"
 
-SRC_URI[sha256sum] = "a12cb38f4793394bf56c6702be29b6e4f09deca0714943bba98a492030651570"
+SRC_URI[sha256sum] = "2de1345897bf839d532c5de0fdb348770ca2a5f4edfb21971582597abb45297d" 
 
 inherit allarch
 
@@ -389,6 +392,7 @@  PACKAGES =+ "${PN}-amphion-vpu-license ${PN}-amphion-vpu \
              ${PN}-ath11k-ipq8074 \
              ${PN}-ath11k-qca2066 \
              ${PN}-ath11k-qca6390 \
+             ${PN}-ath11k-qca6698aq \
              ${PN}-ath11k-qcn9074 \
              ${PN}-ath11k-wcn6750 \
              ${PN}-ath11k-wcn6855 \
@@ -401,6 +405,7 @@  PACKAGES =+ "${PN}-amphion-vpu-license ${PN}-amphion-vpu \
              ${PN}-qca-qca61x4-serial \
              ${PN}-qca-qca61x4-usb \
              ${PN}-qca-qca6390 \
+             ${PN}-qca-wcn3950 \
              ${PN}-qca-wcn3988 \
              ${PN}-qca-wcn399x \
              ${PN}-qca-wcn6750 \
@@ -461,7 +466,7 @@  PACKAGES =+ "${PN}-amphion-vpu-license ${PN}-amphion-vpu \
              ${PN}-prestera \
              ${PN}-qat ${PN}-qat-license \
              ${PN}-qed \
-             ${PN}-qcom-license ${PN}-qcom-yamato-license \
+             ${PN}-qcom-license ${PN}-qcom-2-license ${PN}-qcom-yamato-license \
              ${PN}-qcom-aic100 ${PN}-qcom-qdu100 \
              ${PN}-qcom-venus-1.8 ${PN}-qcom-venus-4.2 ${PN}-qcom-venus-5.2 ${PN}-qcom-venus-5.4 ${PN}-qcom-venus-6.0 \
              ${PN}-qcom-vpu \
@@ -476,7 +481,8 @@  PACKAGES =+ "${PN}-amphion-vpu-license ${PN}-amphion-vpu \
              ${PN}-qcom-qcs615-adreno \
              ${PN}-qcom-qrb4210-adreno \
              ${PN}-qcom-qrb4210-audio ${PN}-qcom-qrb4210-compute ${PN}-qcom-qrb4210-modem \
-             ${PN}-qcom-sa8775p-adreno \
+             ${PN}-qcom-sa8775p-adreno ${PN}-qcom-sa8775p-audio ${PN}-qcom-sa8775p-compute \
+             ${PN}-qcom-sa8775p-generalpurpose \
              ${PN}-qcom-sc8280xp-lenovo-x13s-compat \
              ${PN}-qcom-sc8280xp-lenovo-x13s-audio \
              ${PN}-qcom-sc8280xp-lenovo-x13s-adreno \
@@ -584,6 +590,7 @@  LICENSE:${PN}-ath11k-ipq6018 = "Firmware-qualcommAthos_ath10k"
 LICENSE:${PN}-ath11k-ipq8074 = "Firmware-qualcommAthos_ath10k"
 LICENSE:${PN}-ath11k-qca2066 = "Firmware-qualcommAthos_ath10k"
 LICENSE:${PN}-ath11k-qca6390 = "Firmware-qualcommAthos_ath10k"
+LICENSE:${PN}-ath11k-qca6698aq = "Firmware-qualcommAthos_ath10k"
 LICENSE:${PN}-ath11k-qcn9074 = "Firmware-qualcommAthos_ath10k"
 LICENSE:${PN}-ath11k-wcn6750 = "Firmware-qualcommAthos_ath10k"
 LICENSE:${PN}-ath11k-wcn6855 = "Firmware-qualcommAthos_ath10k"
@@ -595,6 +602,7 @@  LICENSE:${PN}-ath12k-misc = "Firmware-qualcommAthos_ath10k"
 LICENSE:${PN}-qca-qca61x4-serial = "Firmware-qualcommAthos_ath10k"
 LICENSE:${PN}-qca-qca61x4-usb = "Firmware-qualcommAthos_ath10k"
 LICENSE:${PN}-qca-qca6390 = "Firmware-qualcommAthos_ath10k"
+LICENSE:${PN}-qca-wcn3950 = "Firmware-qcom"
 LICENSE:${PN}-qca-wcn3988 = "Firmware-qcom"
 LICENSE:${PN}-qca-wcn399x = "Firmware-qualcommAthos_ath10k"
 LICENSE:${PN}-qca-wcn6750 = "Firmware-qualcommAthos_ath10k"
@@ -629,6 +637,7 @@  FILES:${PN}-ath11k-ipq6018 = "${nonarch_base_libdir}/firmware/ath11k/IPQ6018"
 FILES:${PN}-ath11k-ipq8074 = "${nonarch_base_libdir}/firmware/ath11k/IPQ8074"
 FILES:${PN}-ath11k-qca2066 = "${nonarch_base_libdir}/firmware/ath11k/QCA2066"
 FILES:${PN}-ath11k-qca6390 = "${nonarch_base_libdir}/firmware/ath11k/QCA6390"
+FILES:${PN}-ath11k-qca6698aq = "${nonarch_base_libdir}/firmware/ath11k/QCA6698AQ"
 FILES:${PN}-ath11k-qcn9074 = "${nonarch_base_libdir}/firmware/ath11k/QCN9074"
 FILES:${PN}-ath11k-wcn6750 = "${nonarch_base_libdir}/firmware/ath11k/WCN6750"
 FILES:${PN}-ath11k-wcn6855 = "${nonarch_base_libdir}/firmware/ath11k/WCN6855"
@@ -660,6 +669,12 @@  FILES:${PN}-qca-qca6390 = " \
   ${nonarch_base_libdir}/firmware/qca/htbtfw20.tlv \
   ${nonarch_base_libdir}/firmware/qca/htnv20.bin \
 "
+FILES:${PN}-qca-wcn3950 = " \
+  ${nonarch_base_libdir}/firmware/qca/cmbtfw12.tlv \
+  ${nonarch_base_libdir}/firmware/qca/cmbtfw13.tlv \
+  ${nonarch_base_libdir}/firmware/qca/cmnv12.bin \
+  ${nonarch_base_libdir}/firmware/qca/cmnv13.bin \
+"
 FILES:${PN}-qca-wcn3988 = " \
   ${nonarch_base_libdir}/firmware/qca/apbtfw10.tlv \
   ${nonarch_base_libdir}/firmware/qca/apbtfw11.tlv \
@@ -745,6 +760,7 @@  RDEPENDS:${PN}-ath11k-ipq6018 += "${PN}-ath10k-license"
 RDEPENDS:${PN}-ath11k-ipq8074 += "${PN}-ath10k-license"
 RDEPENDS:${PN}-ath11k-qca2066 += "${PN}-ath10k-license"
 RDEPENDS:${PN}-ath11k-qca6390 += "${PN}-ath10k-license"
+RDEPENDS:${PN}-ath11k-qca6698aq += "${PN}-ath10k-license"
 RDEPENDS:${PN}-ath11k-qcn9074 += "${PN}-ath10k-license"
 RDEPENDS:${PN}-ath11k-wcn6750 += "${PN}-ath10k-license"
 RDEPENDS:${PN}-ath11k-wcn6855 += "${PN}-ath10k-license"
@@ -757,6 +773,7 @@  RDEPENDS:${PN}-qca += "${PN}-ath10k-license ${PN}-qcom-license"
 RDEPENDS:${PN}-qca-qca61x4-serial += "${PN}-ath10k-license"
 RDEPENDS:${PN}-qca-qca61x4-usb += "${PN}-ath10k-license"
 RDEPENDS:${PN}-qca-qca6390 += "${PN}-ath10k-license"
+RDEPENDS:${PN}-qca-wcn3950 += "${PN}-qcom-license"
 RDEPENDS:${PN}-qca-wcn3988 += "${PN}-qcom-license"
 RDEPENDS:${PN}-qca-wcn399x += "${PN}-ath10k-license"
 RDEPENDS:${PN}-qca-wcn6750 += "${PN}-ath10k-license"
@@ -1739,6 +1756,7 @@  FILES:${PN}-linaro-license   = "${nonarch_base_libdir}/firmware/LICENCE.linaro"
 
 # For QCOM VPU/GPU and SDM845
 LICENSE:${PN}-qcom-license = "Firmware-qcom"
+LICENSE:${PN}-qcom-2-license = "Firmware-qcom-2"
 LICENSE:${PN}-qcom-yamato-license = "Firmware-qcom-yamato"
 LICENSE:${PN}-qcom-aic100 = "Firmware-qcom"
 LICENSE:${PN}-qcom-qdu100 = "Firmware-qcom"
@@ -1778,6 +1796,9 @@  LICENSE:${PN}-qcom-qrb4210-compute  = "Firmware-qcom"
 LICENSE:${PN}-qcom-qrb4210-modem = "Firmware-qcom"
 LICENSE:${PN}-qcom-qrb4210-wifi = "Firmware-qcom"
 LICENSE:${PN}-qcom-sa8775p-adreno = "Firmware-qcom"
+LICENSE:${PN}-qcom-sa8775p-audio = "Firmware-qcom-2"
+LICENSE:${PN}-qcom-sa8775p-compute = "Firmware-qcom-2"
+LICENSE:${PN}-qcom-sa8775p-generalpurpose = "Firmware-qcom-2"
 LICENSE:${PN}-qcom-sc8280xp-lenovo-x13s-audio = "Firmware-qcom & Firmware-linaro"
 LICENSE:${PN}-qcom-sc8280xp-lenovo-x13s-adreno = "Firmware-qcom"
 LICENSE:${PN}-qcom-sc8280xp-lenovo-x13s-compute = "Firmware-qcom"
@@ -1797,6 +1818,7 @@  LICENSE:${PN}-qcom-x1e80100-adreno = "Firmware-qcom"
 LICENSE:${PN}-qcom-x1e80100-audio = "Firmware-qcom"
 
 FILES:${PN}-qcom-license   = "${nonarch_base_libdir}/firmware/LICENSE.qcom ${nonarch_base_libdir}/firmware/qcom/NOTICE.txt"
+FILES:${PN}-qcom-2-license   = "${nonarch_base_libdir}/firmware/LICENSE.qcom-2"
 FILES:${PN}-qcom-yamato-license = "${nonarch_base_libdir}/firmware/LICENSE.qcom_yamato"
 
 FILES:${PN}-qcom-aic100 = "${nonarch_base_libdir}/firmware/qcom/aic100/*"
@@ -1842,6 +1864,9 @@  FILES:${PN}-qcom-qrb4210-compute = "${nonarch_base_libdir}/firmware/qcom/qrb4210
 FILES:${PN}-qcom-qrb4210-modem = "${nonarch_base_libdir}/firmware/qcom/qrb4210/modem*.*"
 FILES:${PN}-qcom-qrb4210-wifi = "${nonarch_base_libdir}/firmware/qcom/qrb4210/wlanmdsp.mbn* ${nonarch_base_libdir}/firmware/ath10k/WCN3990/hw1.0/qrb4210/*"
 FILES:${PN}-qcom-sa8775p-adreno = "${nonarch_base_libdir}/firmware/qcom/sa8775p/a663_zap.mbn*"
+FILES:${PN}-qcom-sa8775p-audio = "${nonarch_base_libdir}/firmware/qcom/sa8775p/adsp*.*"
+FILES:${PN}-qcom-sa8775p-compute = "${nonarch_base_libdir}/firmware/qcom/sa8775p/cdsp*.*"
+FILES:${PN}-qcom-sa8775p-generalpurpose = "${nonarch_base_libdir}/firmware/qcom/sa8775p/gpdsp*.*"
 FILES:${PN}-qcom-sc8280xp-lenovo-x13s-compat = "${nonarch_base_libdir}/firmware/qcom/LENOVO/21BX"
 FILES:${PN}-qcom-sc8280xp-lenovo-x13s-audio = "${nonarch_base_libdir}/firmware/qcom/sc8280xp/LENOVO/21BX/*adsp*.* ${nonarch_base_libdir}/firmware/qcom/sc8280xp/LENOVO/21BX/battmgr.jsn* ${nonarch_base_libdir}/firmware/qcom/sc8280xp/LENOVO/21BX/audioreach-tplg.bin* ${nonarch_base_libdir}/firmware/qcom/sc8280xp/SC8280XP-LENOVO-X13S-tplg.bin*"
 FILES:${PN}-qcom-sc8280xp-lenovo-x13s-adreno = "${nonarch_base_libdir}/firmware/qcom/sc8280xp/LENOVO/21BX/qcdxkmsuc8280.mbn*"
@@ -1906,6 +1931,9 @@  RDEPENDS:${PN}-qcom-qrb4210-modem = "${PN}-qcom-license"
 # c.f. https://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git/commit/?id=650e88378e76d5fad3997a5398f1ade47a74d924
 RDEPENDS:${PN}-qcom-qrb4210-wifi = "${PN}-qcom-license ${PN}-qcom-qcm2290-wifi"
 RDEPENDS:${PN}-qcom-sa8775p-adreno = "${PN}-qcom-license"
+RDEPENDS:${PN}-qcom-sa8775p-audio = "${PN}-qcom-2-license"
+RDEPENDS:${PN}-qcom-sa8775p-compute = "${PN}-qcom-2-license"
+RDEPENDS:${PN}-qcom-sa8775p-generalpurpose = "${PN}-qcom-2-license"
 RDEPENDS:${PN}-qcom-sc8280xp-lenovo-x13s-audio = "${PN}-qcom-license ${PN}-linaro-license"
 RDEPENDS:${PN}-qcom-sc8280xp-lenovo-x13s-adreno = "${PN}-qcom-license"
 RDEPENDS:${PN}-qcom-sc8280xp-lenovo-x13s-compute = "${PN}-qcom-license"