summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOtavio Salvador <otavio@ossystems.com.br>2021-09-21 09:11:10 -0300
committerGitHub <noreply@github.com>2021-09-21 09:11:10 -0300
commit727fd8df20c8ee58474ce15cd5e1459f14bee977 (patch)
tree763cf1a6905c04e5d13dfb4f84e933f237fc12b6
parent12c3eed6a90b436565126d8ba6934f794b816e25 (diff)
parenteb5ddb352efc347ef8b7aceda37421caa1d8dbd6 (diff)
downloadmeta-freescale-727fd8df20c8ee58474ce15cd5e1459f14bee977.tar.gz
Merge pull request #873 from zandrey/kernel-upgrade-dunfell
[dunfell]: Consolidated Kernel update (up to v5.4.147)
-rw-r--r--recipes-kernel/linux/linux-fslc-imx_5.4.bb6
-rw-r--r--recipes-kernel/linux/linux-fslc_5.4.bb4
2 files changed, 5 insertions, 5 deletions
diff --git a/recipes-kernel/linux/linux-fslc-imx_5.4.bb b/recipes-kernel/linux/linux-fslc-imx_5.4.bb
index 1f556ebc..df44c71c 100644
--- a/recipes-kernel/linux/linux-fslc-imx_5.4.bb
+++ b/recipes-kernel/linux/linux-fslc-imx_5.4.bb
@@ -28,7 +28,7 @@ Latest stable Kernel patchlevel is applied and maintained by Community."
28# ------------------------------------------------------------------------------ 28# ------------------------------------------------------------------------------
29# 1. Stable (tag or SHA(s)) 29# 1. Stable (tag or SHA(s))
30# ------------------------------------------------------------------------------ 30# ------------------------------------------------------------------------------
31# tag: v5.4.119 31# tag: v5.4.147
32# 32#
33# ------------------------------------------------------------------------------ 33# ------------------------------------------------------------------------------
34# 2. NXP-specific (tag or SHA(s)) 34# 2. NXP-specific (tag or SHA(s))
@@ -73,14 +73,14 @@ LICENSE = "GPLv2"
73LIC_FILES_CHKSUM = "file://COPYING;md5=bbea815ee2795b2f4230826c0c6b8814" 73LIC_FILES_CHKSUM = "file://COPYING;md5=bbea815ee2795b2f4230826c0c6b8814"
74 74
75SRCBRANCH = "5.4-2.1.x-imx" 75SRCBRANCH = "5.4-2.1.x-imx"
76SRCREV = "dc9c8a20afa50de2da8773bbabb71464c4ee9a9d" 76SRCREV = "074a74780f813c7e6037f3ca3e581c405276e502"
77 77
78# PV is defined in the base in linux-imx.inc file and uses the LINUX_VERSION definition 78# PV is defined in the base in linux-imx.inc file and uses the LINUX_VERSION definition
79# required by kernel-yocto.bbclass. 79# required by kernel-yocto.bbclass.
80# 80#
81# LINUX_VERSION define should match to the kernel version referenced by SRC_URI and 81# LINUX_VERSION define should match to the kernel version referenced by SRC_URI and
82# should be updated once patchlevel is merged. 82# should be updated once patchlevel is merged.
83LINUX_VERSION = "5.4.119" 83LINUX_VERSION = "5.4.147"
84 84
85# Local version indicates the branch name in the NXP kernel tree where patches are collected from. 85# Local version indicates the branch name in the NXP kernel tree where patches are collected from.
86LOCALVERSION = "-imx-5.4.24-2.1.0" 86LOCALVERSION = "-imx-5.4.24-2.1.0"
diff --git a/recipes-kernel/linux/linux-fslc_5.4.bb b/recipes-kernel/linux/linux-fslc_5.4.bb
index b0443dc1..393882aa 100644
--- a/recipes-kernel/linux/linux-fslc_5.4.bb
+++ b/recipes-kernel/linux/linux-fslc_5.4.bb
@@ -19,9 +19,9 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=bbea815ee2795b2f4230826c0c6b8814"
19# 19#
20# LINUX_VERSION define should match to the kernel version referenced by SRC_URI and 20# LINUX_VERSION define should match to the kernel version referenced by SRC_URI and
21# should be updated once patchlevel is merged. 21# should be updated once patchlevel is merged.
22LINUX_VERSION = "5.4.119" 22LINUX_VERSION = "5.4.147"
23 23
24SRCBRANCH = "5.4.x+fslc" 24SRCBRANCH = "5.4.x+fslc"
25SRCREV = "43980dc5d7e61868e31dcf56b7403baa90278d96" 25SRCREV = "b938f3a7ff06e9e1fb20657d76c6e7552d3bf0c7"
26 26
27COMPATIBLE_MACHINE = "(mxs|mx5|mx6|vf|use-mainline-bsp)" 27COMPATIBLE_MACHINE = "(mxs|mx5|mx6|vf|use-mainline-bsp)"