From 3340ac0bafdd0dd5e06a939ca577bc3e394acf24 Mon Sep 17 00:00:00 2001 From: Daiane Angolini Date: Thu, 26 Jun 2025 08:02:22 -0300 Subject: [PATCH 1/4] linux-fslc-imx: Bump to 6.12.34 stable tag It also update the list of additional commits. Signed-off-by: Daiane Angolini --- recipes-kernel/linux/linux-fslc-imx_6.12.bb | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/recipes-kernel/linux/linux-fslc-imx_6.12.bb b/recipes-kernel/linux/linux-fslc-imx_6.12.bb index 8d680ff0..ef87e814 100644 --- a/recipes-kernel/linux/linux-fslc-imx_6.12.bb +++ b/recipes-kernel/linux/linux-fslc-imx_6.12.bb @@ -42,7 +42,10 @@ Latest stable Kernel patchlevel is applied and maintained by Community." # conflicts, prioritizing NXP BSP source code as the latest vendor updates. # Additional commits may exist to better acommodate yocto builds. # -# $ git log --oneline --no-merges v6.12.3.. ^mainline/linux-6.12.y ^NXP/lf-6.12.y +# $ git log --oneline --no-merges v6.12.34.. ^mainline/linux-6.12.y ^NXP/lf-6.12.y +# - 8d94e52076a1 Revert "firmware: arm_scmi: Fix i.MX build dependency" +# - adefe4ecd9c6 Revert "PCI: imx6: Fix suspend/resume support on i.MX6QDL" +# - 2837cecae149 imx8mp-olimex.dts: CSI GPIO pins # - 29efe53139ac hwrng: optee: support generic crypto # - 7f80ce9b7c82 arm64: dts: imx8mq: drop cpu-idle-states # - 5e3b6ecf85c4 of: enable using OF_DYNAMIC without OF_UNITTEST @@ -68,14 +71,14 @@ require linux-imx.inc KBRANCH = "6.12-1.0.x-imx" SRC_URI = "git://github.com/Freescale/linux-fslc.git;branch=${KBRANCH};protocol=https" -SRCREV = "29efe53139acb64d96bfcc119cd10d10c552801b" +SRCREV = "c63da44a120c9ad720877a74f0c94e2d9b08cab1" # PV is defined in the base in linux-imx.inc file and uses the LINUX_VERSION definition # required by kernel-yocto.bbclass. # # LINUX_VERSION define should match to the kernel version referenced by SRC_URI and # should be updated once patchlevel is merged. -LINUX_VERSION = "6.12.3" +LINUX_VERSION = "6.12.34" KBUILD_DEFCONFIG:mx6-generic-bsp = "imx_v7_defconfig" KBUILD_DEFCONFIG:mx7-generic-bsp = "imx_v7_defconfig" From c6de8377da6984e96560e1cc43ac76e95f845258 Mon Sep 17 00:00:00 2001 From: Daiane Angolini Date: Thu, 26 Jun 2025 10:30:18 -0300 Subject: [PATCH 2/4] linux-fslc: Bump stable tags 6.12.28 -> 6.12.34 It bumps the stable tags. Signed-off-by: Daiane Angolini --- recipes-kernel/linux/linux-fslc_6.12.bb | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/recipes-kernel/linux/linux-fslc_6.12.bb b/recipes-kernel/linux/linux-fslc_6.12.bb index 7902b753..8b66b82d 100644 --- a/recipes-kernel/linux/linux-fslc_6.12.bb +++ b/recipes-kernel/linux/linux-fslc_6.12.bb @@ -24,12 +24,12 @@ DEPENDS += " \ # LINUX_VERSION define should match to the kernel version referenced by SRC_URI and # should be updated once patchlevel is merged. # -# Linux kernel stable 6.12.28 changelog: -# https://cdn.kernel.org/pub/linux/kernel/v6.x/ChangeLog-6.12.28 -LINUX_VERSION = "6.12.28" +# Linux kernel stable 6.12.34 changelog: +# https://cdn.kernel.org/pub/linux/kernel/v6.x/ChangeLog-6.12.34 +LINUX_VERSION = "6.12.34" KBRANCH = "6.12.x+fslc" -SRCREV = "7a7717289cd3915e484b02c02557de380352b030" +SRCREV = "e92f5b7050c74e8052f071fd2f1d233d9a4b2f30" KBUILD_DEFCONFIG:mx5-generic-bsp = "imx_v6_v7_defconfig" KBUILD_DEFCONFIG:mx6-generic-bsp = "imx_v6_v7_defconfig" From 68051921ba4799c35265254329c8e510ea2667ba Mon Sep 17 00:00:00 2001 From: Daiane Angolini Date: Thu, 26 Jun 2025 10:31:20 -0300 Subject: [PATCH 3/4] linux-fslc-lts (6.1): Bump the stable tags 6.1.72 -> 6.1.111 It bumps the stable tag. Signed-off-by: Daiane Angolini --- recipes-kernel/linux/linux-fslc-lts_6.1.bb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/recipes-kernel/linux/linux-fslc-lts_6.1.bb b/recipes-kernel/linux/linux-fslc-lts_6.1.bb index 8e1bab4b..ae1e71b1 100644 --- a/recipes-kernel/linux/linux-fslc-lts_6.1.bb +++ b/recipes-kernel/linux/linux-fslc-lts_6.1.bb @@ -21,10 +21,10 @@ SRC_URI = "git://github.com/Freescale/linux-fslc.git;branch=${KBRANCH};protocol= # # LINUX_VERSION define should match to the kernel version referenced by SRC_URI and # should be updated once patchlevel is merged. -LINUX_VERSION = "6.1.72" +LINUX_VERSION = "6.1.111" KBRANCH = "6.1.x+fslc" -SRCREV = "b80c9dede70132da3ae7feb949fe0803aad3db24" +SRCREV = "195925841506cd58552d73ebabadd08d6016e4c6" KBUILD_DEFCONFIG:mx5-generic-bsp = "imx_v6_v7_defconfig" KBUILD_DEFCONFIG:mx5-generic-bsp = "imx_v6_v7_defconfig" From ce203ded8deabbe09e038c5f1e2f89322a8e6d1f Mon Sep 17 00:00:00 2001 From: Daiane Angolini Date: Thu, 26 Jun 2025 10:31:56 -0300 Subject: [PATCH 4/4] linux-fslc-lts (6.6): Bump the stable tags 6.6.50 -> 6.6.52 It bumps the stable tags. Signed-off-by: Daiane Angolini --- recipes-kernel/linux/linux-fslc-lts_6.6.bb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/recipes-kernel/linux/linux-fslc-lts_6.6.bb b/recipes-kernel/linux/linux-fslc-lts_6.6.bb index a8c91cdb..cc067262 100644 --- a/recipes-kernel/linux/linux-fslc-lts_6.6.bb +++ b/recipes-kernel/linux/linux-fslc-lts_6.6.bb @@ -19,10 +19,10 @@ SRC_URI = "git://github.com/Freescale/linux-fslc.git;branch=${KBRANCH};protocol= # # LINUX_VERSION define should match to the kernel version referenced by SRC_URI and # should be updated once patchlevel is merged. -LINUX_VERSION = "6.6.50" +LINUX_VERSION = "6.6.52" KBRANCH = "6.6.x+fslc" -SRCREV = "2473dfed9007471b503efe1f7de74d63eaf4c699" +SRCREV = "3768fbd9dd8e0da9e7a24366b6a65a7f8ca25986" KBUILD_DEFCONFIG:mx5-generic-bsp = "imx_v6_v7_defconfig" KBUILD_DEFCONFIG:mx6-generic-bsp = "imx_v6_v7_defconfig"