Merge pull request #1309 from Freescale/backport-1308-to-kirkstone

[Backport kirkstone] Fix the kernel for i.MX8QM and Update the Galcore Kernel Module

2 files changed, 5 insertions, 4 deletions

diff --git a/recipes-kernel/kernel-modules/kernel-module-imx-gpu-viv_6.4.3.p4.2.bb b/recipes-kernel/kernel-modules/kernel-module-imx-gpu-viv_6.4.3.p4.2.bb
index a2aef18d..6c270dfb 100644
--- a/recipes-kernel/kernel-modules/kernel-module-imx-gpu-viv_6.4.3.p4.2.bb
+++ b/recipes-kernel/kernel-modules/kernel-module-imx-gpu-viv_6.4.3.p4.2.bb
@@ -9,10 +9,10 @@ LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/GPL-2.0-only;md5=801f80980d171d
 
 SRC_URI = "${KERNEL_SRC};subpath=drivers/mxc/gpu-viv;destsuffix=git/src \
            file://Add-makefile.patch"
-KERNEL_SRC ?= "git://source.codeaurora.org/external/imx/linux-imx.git;protocol=https;branch=${SRCBRANCH}"
+KERNEL_SRC ?= "git://github.com/nxp-imx/linux-imx.git;protocol=https;branch=${SRCBRANCH}"
 SRCBRANCH = "lf-5.15.y"
-LOCALVERSION = "-5.15.32-2.0.0"
-SRCREV = "545fd17e9f396c78c692e8abf06e36c5df0f5c69"
+LOCALVERSION = "-5.15.52-2.1.0"
+SRCREV = "36363d8623ba60858e2632b7d2b70dae932c9a8b"
 
 S = "${WORKDIR}/git"
 
diff --git a/recipes-kernel/linux/linux-fslc-imx_5.15.bb b/recipes-kernel/linux/linux-fslc-imx_5.15.bb
index 2bd16813..25608c83 100644
--- a/recipes-kernel/linux/linux-fslc-imx_5.15.bb
+++ b/recipes-kernel/linux/linux-fslc-imx_5.15.bb
@@ -51,6 +51,7 @@ Latest stable Kernel patchlevel is applied and maintained by Community."
 # 44970f9fbed6 Revert "media: imx-jpeg: Align upwards buffer size"
 # ee7468eafdaa Revert "LF-6878: LF-6658: media: imx-jpeg: Support contiguous and non contiguous format"
 # bb6e70bff1b7 drivers/soc/imx/gpcv2.c: complete patch revert
+# a682d463667a Revert "serial: fsl_lpuart: Reset prior to registration"
 #
 # NOTE to upgraders:
 # This recipe should NOT collect individual patches, they should be applied to
@@ -64,7 +65,7 @@ LICENSE = "GPL-2.0-only"
 LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46"
 
 KBRANCH = "5.15-2.1.x-imx"
-SRCREV = "0dbb0e28ad332aa0955b873beb91190ae05ac655"
+SRCREV = "9dcc132b0caa04022a9adbb76510258684fbfef7"
 
 # PV is defined in the base in linux-imx.inc file and uses the LINUX_VERSION definition
 # required by kernel-yocto.bbclass.