summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOtavio Salvador <otavio@ossystems.com.br>2022-06-11 20:30:59 -0300
committerGitHub <noreply@github.com>2022-06-11 20:30:59 -0300
commit4cc87c7eb70bdb2de8276bc17301c9ac3dfadb99 (patch)
tree2d7fd7255916b00e6d1a44f25fa6209ed661ee5f
parent6072677cc0fd41c2e7666b022ef45e9122ef6244 (diff)
parent0e7b9cc8074bc5c4dedcc60c8a584db8702879b7 (diff)
downloadmeta-freescale-4cc87c7eb70bdb2de8276bc17301c9ac3dfadb99.tar.gz
Merge pull request #1106 from zandrey/topic/kernel-update-master
Consolidated Kernel (v5.15.46 + v5.18.3)
-rw-r--r--recipes-kernel/linux/linux-fslc-imx_5.15.bb6
-rw-r--r--recipes-kernel/linux/linux-fslc-lts_5.15.bb4
-rw-r--r--recipes-kernel/linux/linux-fslc_5.18.bb4
3 files changed, 7 insertions, 7 deletions
diff --git a/recipes-kernel/linux/linux-fslc-imx_5.15.bb b/recipes-kernel/linux/linux-fslc-imx_5.15.bb
index 16bd4d64..926a4956 100644
--- a/recipes-kernel/linux/linux-fslc-imx_5.15.bb
+++ b/recipes-kernel/linux/linux-fslc-imx_5.15.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.15.45 31# tag: v5.15.46
32# 32#
33# ------------------------------------------------------------------------------ 33# ------------------------------------------------------------------------------
34# 2. NXP-specific (tag or SHA(s)) 34# 2. NXP-specific (tag or SHA(s))
@@ -70,14 +70,14 @@ LICENSE = "GPL-2.0-only"
70LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46" 70LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46"
71 71
72KBRANCH = "5.15-1.0.x-imx" 72KBRANCH = "5.15-1.0.x-imx"
73SRCREV = "e6ad415b02af0d025969cbf0ba1d48870b6687bf" 73SRCREV = "2badd023089aeeadb482300d5d409d6deece659c"
74 74
75# PV is defined in the base in linux-imx.inc file and uses the LINUX_VERSION definition 75# PV is defined in the base in linux-imx.inc file and uses the LINUX_VERSION definition
76# required by kernel-yocto.bbclass. 76# required by kernel-yocto.bbclass.
77# 77#
78# LINUX_VERSION define should match to the kernel version referenced by SRC_URI and 78# LINUX_VERSION define should match to the kernel version referenced by SRC_URI and
79# should be updated once patchlevel is merged. 79# should be updated once patchlevel is merged.
80LINUX_VERSION = "5.15.45" 80LINUX_VERSION = "5.15.46"
81 81
82# Local version indicates the branch name in the NXP kernel tree where patches are collected from. 82# Local version indicates the branch name in the NXP kernel tree where patches are collected from.
83LOCALVERSION = "-5.15.5-1.0.0" 83LOCALVERSION = "-5.15.5-1.0.0"
diff --git a/recipes-kernel/linux/linux-fslc-lts_5.15.bb b/recipes-kernel/linux/linux-fslc-lts_5.15.bb
index f21f4b98..edf45d3b 100644
--- a/recipes-kernel/linux/linux-fslc-lts_5.15.bb
+++ b/recipes-kernel/linux/linux-fslc-lts_5.15.bb
@@ -19,9 +19,9 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46"
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.15.45" 22LINUX_VERSION = "5.15.46"
23 23
24KBRANCH = "5.15.x+fslc" 24KBRANCH = "5.15.x+fslc"
25SRCREV = "b3ea37332bac1eacbb0110bbb2d7792e23951ef9" 25SRCREV = "b0d7488836b992745e42ac055cb9bd59ba29c3ae"
26 26
27COMPATIBLE_MACHINE = "(imx-generic-bsp)" 27COMPATIBLE_MACHINE = "(imx-generic-bsp)"
diff --git a/recipes-kernel/linux/linux-fslc_5.18.bb b/recipes-kernel/linux/linux-fslc_5.18.bb
index 44eed1ae..b1fdd07e 100644
--- a/recipes-kernel/linux/linux-fslc_5.18.bb
+++ b/recipes-kernel/linux/linux-fslc_5.18.bb
@@ -19,9 +19,9 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46"
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.18.2" 22LINUX_VERSION = "5.18.3"
23 23
24KBRANCH = "5.18.x+fslc" 24KBRANCH = "5.18.x+fslc"
25SRCREV = "617988c95e786e71d25d739d5a497335058b361c" 25SRCREV = "3e911e32b6228ba4a05f476830c0179aa99d5985"
26 26
27COMPATIBLE_MACHINE = "(imx-generic-bsp)" 27COMPATIBLE_MACHINE = "(imx-generic-bsp)"