diff options
author | Otavio Salvador <otavio@ossystems.com.br> | 2021-10-13 08:41:36 -0300 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-10-13 08:41:36 -0300 |
commit | 469d6c958c76ea235b3d3c1527e797ce3a7392e3 (patch) | |
tree | aab4283d5fbc2ebcd36635651deb8856a497af9d | |
parent | 87931f3d9368b400561d3c80ab5517f4d7c3468b (diff) | |
parent | 7a0d46d87a49cab6f97ffcead7ecc74f6202d98c (diff) | |
download | meta-freescale-469d6c958c76ea235b3d3c1527e797ce3a7392e3.tar.gz |
Merge pull request #880 from Freescale/backport-879-to-hardknott
[Backport hardknott] linux-imx*: upgrade to 5.10.52
-rw-r--r-- | recipes-kernel/kernel-modules/kernel-module-imx-gpu-viv_6.4.3.p2.0.bb | 2 | ||||
-rw-r--r-- | recipes-kernel/linux/linux-imx-headers_5.10.bb | 2 | ||||
-rw-r--r-- | recipes-kernel/linux/linux-imx_5.10.bb | 6 |
3 files changed, 5 insertions, 5 deletions
diff --git a/recipes-kernel/kernel-modules/kernel-module-imx-gpu-viv_6.4.3.p2.0.bb b/recipes-kernel/kernel-modules/kernel-module-imx-gpu-viv_6.4.3.p2.0.bb index e113aff7..a8b890fe 100644 --- a/recipes-kernel/kernel-modules/kernel-module-imx-gpu-viv_6.4.3.p2.0.bb +++ b/recipes-kernel/kernel-modules/kernel-module-imx-gpu-viv_6.4.3.p2.0.bb | |||
@@ -8,7 +8,7 @@ LICENSE = "GPLv2" | |||
8 | LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/GPL-2.0-only;md5=801f80980d171dd6425610833a22dbe6" | 8 | LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/GPL-2.0-only;md5=801f80980d171dd6425610833a22dbe6" |
9 | 9 | ||
10 | SRCBRANCH = "lf-5.10.y" | 10 | SRCBRANCH = "lf-5.10.y" |
11 | LOCALVERSION = "-5.10.35-2.0.0" | 11 | LOCALVERSION = "-5.10.52-2.1.0" |
12 | KERNEL_SRC ?= "git://source.codeaurora.org/external/imx/linux-imx.git;protocol=https" | 12 | KERNEL_SRC ?= "git://source.codeaurora.org/external/imx/linux-imx.git;protocol=https" |
13 | SRC_URI = " \ | 13 | SRC_URI = " \ |
14 | ${KERNEL_SRC};branch=${SRCBRANCH};subpath=drivers/mxc/gpu-viv;destsuffix=git/src \ | 14 | ${KERNEL_SRC};branch=${SRCBRANCH};subpath=drivers/mxc/gpu-viv;destsuffix=git/src \ |
diff --git a/recipes-kernel/linux/linux-imx-headers_5.10.bb b/recipes-kernel/linux/linux-imx-headers_5.10.bb index c656fa55..0e15f343 100644 --- a/recipes-kernel/linux/linux-imx-headers_5.10.bb +++ b/recipes-kernel/linux/linux-imx-headers_5.10.bb | |||
@@ -8,7 +8,7 @@ LICENSE = "GPLv2" | |||
8 | LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46" | 8 | LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46" |
9 | 9 | ||
10 | SRCBRANCH = "lf-5.10.y" | 10 | SRCBRANCH = "lf-5.10.y" |
11 | LOCALVERSION = "-5.10.35-2.0.0" | 11 | LOCALVERSION = "-5.10.52-2.1.0" |
12 | SRC_URI = "git://source.codeaurora.org/external/imx/linux-imx.git;protocol=https;branch=${SRCBRANCH}" | 12 | SRC_URI = "git://source.codeaurora.org/external/imx/linux-imx.git;protocol=https;branch=${SRCBRANCH}" |
13 | SRCREV = "ef3f2cfc6010c13feb40cfb7fd7490832cf86f45" | 13 | SRCREV = "ef3f2cfc6010c13feb40cfb7fd7490832cf86f45" |
14 | 14 | ||
diff --git a/recipes-kernel/linux/linux-imx_5.10.bb b/recipes-kernel/linux/linux-imx_5.10.bb index 68344e4e..62ecf4bc 100644 --- a/recipes-kernel/linux/linux-imx_5.10.bb +++ b/recipes-kernel/linux/linux-imx_5.10.bb | |||
@@ -18,15 +18,15 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46" | |||
18 | DEPENDS += "lzop-native bc-native" | 18 | DEPENDS += "lzop-native bc-native" |
19 | 19 | ||
20 | SRCBRANCH = "lf-5.10.y" | 20 | SRCBRANCH = "lf-5.10.y" |
21 | LOCALVERSION = "-5.10.35-2.0.0" | 21 | LOCALVERSION = "-5.10.52-2.1.0" |
22 | SRCREV = "ef3f2cfc6010c13feb40cfb7fd7490832cf86f45" | 22 | SRCREV = "a11753a89ec610768301d4070e10b8bd60fde8cd" |
23 | 23 | ||
24 | # PV is defined in the base in linux-imx.inc file and uses the LINUX_VERSION definition | 24 | # PV is defined in the base in linux-imx.inc file and uses the LINUX_VERSION definition |
25 | # required by kernel-yocto.bbclass. | 25 | # required by kernel-yocto.bbclass. |
26 | # | 26 | # |
27 | # LINUX_VERSION define should match to the kernel version referenced by SRC_URI and | 27 | # LINUX_VERSION define should match to the kernel version referenced by SRC_URI and |
28 | # should be updated once patchlevel is merged. | 28 | # should be updated once patchlevel is merged. |
29 | LINUX_VERSION = "5.10.35" | 29 | LINUX_VERSION = "5.10.52" |
30 | 30 | ||
31 | DEFAULT_PREFERENCE = "1" | 31 | DEFAULT_PREFERENCE = "1" |
32 | 32 | ||