diff options
author | Otavio Salvador <otavio@ossystems.com.br> | 2022-11-24 20:08:01 -0300 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-11-24 20:08:01 -0300 |
commit | 916f0760aa0f6ec29b7c74bbac1806cd1d9afb75 (patch) | |
tree | 39b66908cc8cc6c28121192e2ecb5f8533af8562 | |
parent | fefd97bc11f51948f4a77cbfcbe74c5c731d4ec6 (diff) | |
parent | 859c1c9635ee1e5dbde1b782fd68a4dbd34e36db (diff) | |
download | meta-freescale-916f0760aa0f6ec29b7c74bbac1806cd1d9afb75.tar.gz |
Merge pull request #1309 from Freescale/backport-1308-to-kirkstone
[Backport kirkstone] Fix the kernel for i.MX8QM and Update the Galcore Kernel Module
-rw-r--r-- | recipes-kernel/kernel-modules/kernel-module-imx-gpu-viv_6.4.3.p4.2.bb | 6 | ||||
-rw-r--r-- | recipes-kernel/linux/linux-fslc-imx_5.15.bb | 3 |
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 | |||
9 | 9 | ||
10 | SRC_URI = "${KERNEL_SRC};subpath=drivers/mxc/gpu-viv;destsuffix=git/src \ | 10 | SRC_URI = "${KERNEL_SRC};subpath=drivers/mxc/gpu-viv;destsuffix=git/src \ |
11 | file://Add-makefile.patch" | 11 | file://Add-makefile.patch" |
12 | KERNEL_SRC ?= "git://source.codeaurora.org/external/imx/linux-imx.git;protocol=https;branch=${SRCBRANCH}" | 12 | KERNEL_SRC ?= "git://github.com/nxp-imx/linux-imx.git;protocol=https;branch=${SRCBRANCH}" |
13 | SRCBRANCH = "lf-5.15.y" | 13 | SRCBRANCH = "lf-5.15.y" |
14 | LOCALVERSION = "-5.15.32-2.0.0" | 14 | LOCALVERSION = "-5.15.52-2.1.0" |
15 | SRCREV = "545fd17e9f396c78c692e8abf06e36c5df0f5c69" | 15 | SRCREV = "36363d8623ba60858e2632b7d2b70dae932c9a8b" |
16 | 16 | ||
17 | S = "${WORKDIR}/git" | 17 | S = "${WORKDIR}/git" |
18 | 18 | ||
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." | |||
51 | # 44970f9fbed6 Revert "media: imx-jpeg: Align upwards buffer size" | 51 | # 44970f9fbed6 Revert "media: imx-jpeg: Align upwards buffer size" |
52 | # ee7468eafdaa Revert "LF-6878: LF-6658: media: imx-jpeg: Support contiguous and non contiguous format" | 52 | # ee7468eafdaa Revert "LF-6878: LF-6658: media: imx-jpeg: Support contiguous and non contiguous format" |
53 | # bb6e70bff1b7 drivers/soc/imx/gpcv2.c: complete patch revert | 53 | # bb6e70bff1b7 drivers/soc/imx/gpcv2.c: complete patch revert |
54 | # a682d463667a Revert "serial: fsl_lpuart: Reset prior to registration" | ||
54 | # | 55 | # |
55 | # NOTE to upgraders: | 56 | # NOTE to upgraders: |
56 | # This recipe should NOT collect individual patches, they should be applied to | 57 | # This recipe should NOT collect individual patches, they should be applied to |
@@ -64,7 +65,7 @@ LICENSE = "GPL-2.0-only" | |||
64 | LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46" | 65 | LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46" |
65 | 66 | ||
66 | KBRANCH = "5.15-2.1.x-imx" | 67 | KBRANCH = "5.15-2.1.x-imx" |
67 | SRCREV = "0dbb0e28ad332aa0955b873beb91190ae05ac655" | 68 | SRCREV = "9dcc132b0caa04022a9adbb76510258684fbfef7" |
68 | 69 | ||
69 | # PV is defined in the base in linux-imx.inc file and uses the LINUX_VERSION definition | 70 | # PV is defined in the base in linux-imx.inc file and uses the LINUX_VERSION definition |
70 | # required by kernel-yocto.bbclass. | 71 | # required by kernel-yocto.bbclass. |