diff mbox series

linux-firmware: upgrade 20240811 -> 20240909

Message ID 20240911093923.2087482-1-quic_vpuar@quicinc.com
State New
Headers show
Series linux-firmware: upgrade 20240811 -> 20240909 | expand

Commit Message

Vivek Puar Sept. 11, 2024, 9:39 a.m. UTC 
License-Update: additional firmwares

The commit [1] adds the venus.mdt symlink in WHENCE file
as a patch, we can remove the patch now as linux-firmware
20240909 already contains this fix as part of WHENCE file.

[1] https://gitlab.com/kernel-firmware/linux-firmware/-/commit/91f955b730451855c14c332f1db9844b2d7b0cf2

Signed-off-by: Vivek Puar <quic_vpuar@quicinc.com>
Cc: Richard Purdie <richard.purdie@linuxfoundation.org>
---
 ...-compatibility-with-kernels-before-6.patch | 35 -------------------
 ...20240811.bb => linux-firmware_20240909.bb} |  5 ++-
 2 files changed, 2 insertions(+), 38 deletions(-)
 delete mode 100644 meta/recipes-kernel/linux-firmware/linux-firmware/0001-qcom-vpu-restore-compatibility-with-kernels-before-6.patch
 rename meta/recipes-kernel/linux-firmware/{linux-firmware_20240811.bb => linux-firmware_20240909.bb} (99%)
diff mbox series

Patch

diff --git a/meta/recipes-kernel/linux-firmware/linux-firmware/0001-qcom-vpu-restore-compatibility-with-kernels-before-6.patch b/meta/recipes-kernel/linux-firmware/linux-firmware/0001-qcom-vpu-restore-compatibility-with-kernels-before-6.patch
deleted file mode 100644
index b1cb5d1f0b..0000000000
--- a/meta/recipes-kernel/linux-firmware/linux-firmware/0001-qcom-vpu-restore-compatibility-with-kernels-before-6.patch
+++ /dev/null
@@ -1,35 +0,0 @@ 
-From 4728fcc52fdf311048f41766aa27cdf5a4a9e7ad Mon Sep 17 00:00:00 2001
-From: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
-Date: Wed, 28 Aug 2024 09:01:14 +0300
-Subject: [PATCH] qcom: vpu: restore compatibility with kernels before 6.6
-
-Linux kernels before 6.6 used qcom/vpu-1.0/venus.mdt as a firmware
-filename for Qualcomm SM8250 devices. Commit 36db650dae03 ("qcom: update
-path for video firmware for vpu-1/2/3.0") moved the VPU firmware, added
-the venus.mbn compatibility symlink, but at the same time it dropped
-the venus.mdt symlink. Bring the historical name back to restore
-compatibility with kernels older than 6.6.
-
-Fixes: 36db650dae03 ("qcom: update path for video firmware for vpu-1/2/3.0")
-Cc: Dikshita Agarwal <quic_dikshita@quicinc.com>
-Upstream-Status: Submitted [https://lore.kernel.org/linux-firmware/20240828060831.34519-1-dmitry.baryshkov@linaro.org]
-Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
----
- WHENCE | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/WHENCE b/WHENCE
-index 06c3c6fff673..4d9cd340a9dd 100644
---- a/WHENCE
-+++ b/WHENCE
-@@ -5974,6 +5974,7 @@ Version: VIDEO.VE.6.0-00049-PROD-1
- 
- File: qcom/vpu/vpu20_p4.mbn
- Link: qcom/vpu-1.0/venus.mbn -> ../vpu/vpu20_p4.mbn
-+Link: qcom/vpu-1.0/venus.mdt -> ../vpu/vpu20_p4.mbn
- 
- Version: VIDEO.VPU.1.0-00087-PROD-1
- 
--- 
-2.45.2
-
diff --git a/meta/recipes-kernel/linux-firmware/linux-firmware_20240811.bb b/meta/recipes-kernel/linux-firmware/linux-firmware_20240909.bb
similarity index 99%
rename from meta/recipes-kernel/linux-firmware/linux-firmware_20240811.bb
rename to meta/recipes-kernel/linux-firmware/linux-firmware_20240909.bb
index b620a6e249..2aab6204da 100644
--- a/meta/recipes-kernel/linux-firmware/linux-firmware_20240811.bb
+++ b/meta/recipes-kernel/linux-firmware/linux-firmware_20240909.bb
@@ -158,7 +158,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  = "5d402bd7c43dd2c2835b81bf872aa127"
+WHENCE_CHKSUM  = "6ae5ffd807c84809977286ad0b37acdb"
 
 # These are not common licenses, set NO_GENERIC_LICENSE for them
 # so that the license files will be copied from fetched source
@@ -240,7 +240,6 @@  PE = "1"
 
 SRC_URI = "\
   ${KERNELORG_MIRROR}/linux/kernel/firmware/${BPN}-${PV}.tar.xz \
-  file://0001-qcom-vpu-restore-compatibility-with-kernels-before-6.patch \
 "
 
 BBCLASSEXTEND = "devupstream:target"
@@ -248,7 +247,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] = "58f1a14b800e3d1967986197d83c81f1ad14b7898a557133c58df0c02c538082"
+SRC_URI[sha256sum] = "943fbd19883cf8eadf89e0b22422549db056557b1ecd30a56400615971369671"
 
 inherit allarch