Merge pull request #1608 from MrCry0/master-imx

Update imx[-fslc] linux kernel, u-boot and related recipes to 6.1.22-2.0.0

3 files changed, 15 insertions, 11 deletions

diff --git a/recipes-kernel/linux/linux-fslc-imx_6.1.bb b/recipes-kernel/linux/linux-fslc-imx_6.1.bb
index 8c26da77..1dcb1f91 100644
--- a/recipes-kernel/linux/linux-fslc-imx_6.1.bb
+++ b/recipes-kernel/linux/linux-fslc-imx_6.1.bb
@@ -28,17 +28,21 @@ Latest stable Kernel patchlevel is applied and maintained by Community."
 # ------------------------------------------------------------------------------
 # 1. Stable (tag or SHA(s))
 # ------------------------------------------------------------------------------
-#    tag: v6.1.24
+#    tag: v6.1.38
 #
 # ------------------------------------------------------------------------------
 # 2. NXP-specific (tag or SHA(s))
 # ------------------------------------------------------------------------------
-#    tag: lf-6.1.1-1.0.0
+#    tag: lf-6.1.22-2.0.0
 #
 # ------------------------------------------------------------------------------
 # 3. Critical patches (SHA(s))
 # ------------------------------------------------------------------------------
-# - ad9ab3b3c553c ARM: imx_v7_defconfig: Remove KERNEL_LZO config
+# - 3f1f2ea729550 mxc: gpu-viv: change _QuerySignal() return type to gceSTATUS
+# - b73c6797ee427 ARM: imx_v7_defconfig: Remove KERNEL_LZO config
+# - ec33c7fc43bef touchscreen: Kconfig: add I2C dependency for CT36X
+# - 6c41233a2cfbe pwm: pwm-adp5585: fix get_state callback prototype
+# - 9c7540ecb891f pwm: pwm-rpmsg-imx: fix get_state callback prototype
 #
 # NOTE to upgraders:
 # This recipe should NOT collect individual patches, they should be applied to
@@ -48,16 +52,16 @@ Latest stable Kernel patchlevel is applied and maintained by Community."
 
 require linux-imx.inc
 
-KBRANCH = "6.1-1.0.x-imx"
+KBRANCH = "6.1-2.0.x-imx"
 SRC_URI = "git://github.com/Freescale/linux-fslc.git;branch=${KBRANCH};protocol=https"
-SRCREV = "ad9ab3b3c553cbc3c61f233b6e2cd5abdd2a624b"
+SRCREV = "b872b1170fc8843b55e9f8838dd373ff43bb7552"
 
 # 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.1.24"
+LINUX_VERSION = "6.1.38"
 
 KBUILD_DEFCONFIG:mx6-generic-bsp = "imx_v7_defconfig"
 KBUILD_DEFCONFIG:mx7-generic-bsp = "imx_v7_defconfig"
diff --git a/recipes-kernel/linux/linux-imx-headers_6.1.bb b/recipes-kernel/linux/linux-imx-headers_6.1.bb
index cec22c1b..633418ab 100644
--- a/recipes-kernel/linux/linux-imx-headers_6.1.bb
+++ b/recipes-kernel/linux/linux-imx-headers_6.1.bb
@@ -9,8 +9,8 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46"
 
 SRC_URI = "git://github.com/nxp-imx/linux-imx.git;protocol=https;branch=${SRCBRANCH}"
 SRCBRANCH = "lf-6.1.y"
-LOCALVERSION = "-6.1.1-1.0.0"
-SRCREV = "29549c7073bf72cfb2c4614d37de45ec36b60475"
+LOCALVERSION = "-6.1.22-2.0.0"
+SRCREV = "66e442bc7fdcc935e6faa94c743f653263d4ed67"
 
 S = "${WORKDIR}/git"
 
diff --git a/recipes-kernel/linux/linux-imx_6.1.bb b/recipes-kernel/linux/linux-imx_6.1.bb
index 59a7e5cc..8b1e6045 100644
--- a/recipes-kernel/linux/linux-imx_6.1.bb
+++ b/recipes-kernel/linux/linux-imx_6.1.bb
@@ -15,15 +15,15 @@ require recipes-kernel/linux/linux-imx.inc
 SRC_URI += "file://ARM-imx_v7_defconfig-Remove-KERNEL_LZO-config.patch"
 
 SRCBRANCH = "lf-6.1.y"
-LOCALVERSION = "-6.1.1-1.0.0"
-SRCREV = "29549c7073bf72cfb2c4614d37de45ec36b60475"
+LOCALVERSION = "-6.1.22-2.0.0"
+SRCREV = "66e442bc7fdcc935e6faa94c743f653263d4ed67"
 
 # 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.1.1"
+LINUX_VERSION = "6.1.22"
 
 KBUILD_DEFCONFIG:mx6-generic-bsp = "imx_v7_defconfig"
 KBUILD_DEFCONFIG:mx7-generic-bsp = "imx_v7_defconfig"