summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--recipes-bsp/u-boot/u-boot-fslc-common_2022.04.inc (renamed from recipes-bsp/u-boot/u-boot-fslc-common_2022.01.inc)6
-rw-r--r--recipes-bsp/u-boot/u-boot-fslc-mfgtool_2022.04.bb (renamed from recipes-bsp/u-boot/u-boot-fslc-mfgtool_2022.01.bb)0
-rw-r--r--recipes-bsp/u-boot/u-boot-fslc-mxsboot_2022.04.bb (renamed from recipes-bsp/u-boot/u-boot-fslc-mxsboot_2022.01.bb)0
-rw-r--r--recipes-bsp/u-boot/u-boot-fslc_2022.04.bb (renamed from recipes-bsp/u-boot/u-boot-fslc_2022.01.bb)0
-rw-r--r--recipes-kernel/linux/linux-fslc-imx_5.10.bb7
-rw-r--r--recipes-kernel/linux/linux-fslc-lts_5.10.bb4
-rw-r--r--recipes-kernel/linux/linux-fslc_5.15.bb4
7 files changed, 11 insertions, 10 deletions
diff --git a/recipes-bsp/u-boot/u-boot-fslc-common_2022.01.inc b/recipes-bsp/u-boot/u-boot-fslc-common_2022.04.inc
index 43478516..0fad0367 100644
--- a/recipes-bsp/u-boot/u-boot-fslc-common_2022.01.inc
+++ b/recipes-bsp/u-boot/u-boot-fslc-common_2022.04.inc
@@ -10,10 +10,10 @@ DEPENDS += "flex-native bison-native"
10 10
11SRC_URI = "git://github.com/Freescale/u-boot-fslc.git;branch=${SRCBRANCH};protocol=https" 11SRC_URI = "git://github.com/Freescale/u-boot-fslc.git;branch=${SRCBRANCH};protocol=https"
12 12
13SRCREV = "ed9503daa309c765a8654dc89c486326b4850f6d" 13SRCREV = "f88519827335b548fcd276acda32107f5120276f"
14SRCBRANCH = "2022.01+fslc" 14SRCBRANCH = "2022.04+fslc"
15 15
16PV = "v2022.01+git${SRCPV}" 16PV = "v2022.04+git${SRCPV}"
17 17
18S = "${WORKDIR}/git" 18S = "${WORKDIR}/git"
19B = "${WORKDIR}/build" 19B = "${WORKDIR}/build"
diff --git a/recipes-bsp/u-boot/u-boot-fslc-mfgtool_2022.01.bb b/recipes-bsp/u-boot/u-boot-fslc-mfgtool_2022.04.bb
index 2e79166b..2e79166b 100644
--- a/recipes-bsp/u-boot/u-boot-fslc-mfgtool_2022.01.bb
+++ b/recipes-bsp/u-boot/u-boot-fslc-mfgtool_2022.04.bb
diff --git a/recipes-bsp/u-boot/u-boot-fslc-mxsboot_2022.01.bb b/recipes-bsp/u-boot/u-boot-fslc-mxsboot_2022.04.bb
index 0a0a1d9c..0a0a1d9c 100644
--- a/recipes-bsp/u-boot/u-boot-fslc-mxsboot_2022.01.bb
+++ b/recipes-bsp/u-boot/u-boot-fslc-mxsboot_2022.04.bb
diff --git a/recipes-bsp/u-boot/u-boot-fslc_2022.01.bb b/recipes-bsp/u-boot/u-boot-fslc_2022.04.bb
index ec5298b6..ec5298b6 100644
--- a/recipes-bsp/u-boot/u-boot-fslc_2022.01.bb
+++ b/recipes-bsp/u-boot/u-boot-fslc_2022.04.bb
diff --git a/recipes-kernel/linux/linux-fslc-imx_5.10.bb b/recipes-kernel/linux/linux-fslc-imx_5.10.bb
index 8aa662eb..88f5bf90 100644
--- a/recipes-kernel/linux/linux-fslc-imx_5.10.bb
+++ b/recipes-kernel/linux/linux-fslc-imx_5.10.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.10.93 31# tag: v5.10.109
32# 32#
33# ------------------------------------------------------------------------------ 33# ------------------------------------------------------------------------------
34# 2. NXP-specific (tag or SHA(s)) 34# 2. NXP-specific (tag or SHA(s))
@@ -38,6 +38,7 @@ Latest stable Kernel patchlevel is applied and maintained by Community."
38# ------------------------------------------------------------------------------ 38# ------------------------------------------------------------------------------
39# 3. Critical patches (SHA(s)) 39# 3. Critical patches (SHA(s))
40# ------------------------------------------------------------------------------ 40# ------------------------------------------------------------------------------
41# 27b6c760cc7f ("thermal: imx: fix a merging issue")
41# 8ef27ae9f200 ("gpio: fix enabling GPIO_VF610") 42# 8ef27ae9f200 ("gpio: fix enabling GPIO_VF610")
42# 12099c38577a ("ASoC: fsl_sai: Correct the clock source for mclk0") 43# 12099c38577a ("ASoC: fsl_sai: Correct the clock source for mclk0")
43# db172377e6e2 ("Revert "MLK-12786-2: ASoC: fsl_sai: correct the clock source for mclk0"") 44# db172377e6e2 ("Revert "MLK-12786-2: ASoC: fsl_sai: correct the clock source for mclk0"")
@@ -73,14 +74,14 @@ LICENSE = "GPL-2.0-only"
73LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46" 74LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46"
74 75
75KBRANCH = "5.10-2.1.x-imx" 76KBRANCH = "5.10-2.1.x-imx"
76SRCREV = "f28a9b90c506241e614212f2ce314d8f5460819d" 77SRCREV = "882b6357e0d9303c747ac47dbf1e624a84fcb8dc"
77 78
78# PV is defined in the base in linux-imx.inc file and uses the LINUX_VERSION definition 79# PV is defined in the base in linux-imx.inc file and uses the LINUX_VERSION definition
79# required by kernel-yocto.bbclass. 80# required by kernel-yocto.bbclass.
80# 81#
81# LINUX_VERSION define should match to the kernel version referenced by SRC_URI and 82# LINUX_VERSION define should match to the kernel version referenced by SRC_URI and
82# should be updated once patchlevel is merged. 83# should be updated once patchlevel is merged.
83LINUX_VERSION = "5.10.93" 84LINUX_VERSION = "5.10.109"
84 85
85# Local version indicates the branch name in the NXP kernel tree where patches are collected from. 86# Local version indicates the branch name in the NXP kernel tree where patches are collected from.
86LOCALVERSION = "-5.10.52-2.1.0" 87LOCALVERSION = "-5.10.52-2.1.0"
diff --git a/recipes-kernel/linux/linux-fslc-lts_5.10.bb b/recipes-kernel/linux/linux-fslc-lts_5.10.bb
index 4320280e..3e0d0847 100644
--- a/recipes-kernel/linux/linux-fslc-lts_5.10.bb
+++ b/recipes-kernel/linux/linux-fslc-lts_5.10.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.10.93" 22LINUX_VERSION = "5.10.109"
23 23
24KBRANCH = "5.10.x+fslc" 24KBRANCH = "5.10.x+fslc"
25SRCREV = "de6a8455baae279feddb56c99056aa075175cd68" 25SRCREV = "ad946caa1bfa863f02a56d0741ad3c3dcc772ef8"
26 26
27COMPATIBLE_MACHINE = "(imx-generic-bsp)" 27COMPATIBLE_MACHINE = "(imx-generic-bsp)"
diff --git a/recipes-kernel/linux/linux-fslc_5.15.bb b/recipes-kernel/linux/linux-fslc_5.15.bb
index 23fc62ac..c67f4265 100644
--- a/recipes-kernel/linux/linux-fslc_5.15.bb
+++ b/recipes-kernel/linux/linux-fslc_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.16" 22LINUX_VERSION = "5.15.32"
23 23
24KBRANCH = "5.15.x+fslc" 24KBRANCH = "5.15.x+fslc"
25SRCREV = "d084d166324389d09f73d8f2e91b989d69432335" 25SRCREV = "0cd0faf39b15007499be2f444034c0f62a3eea9a"
26 26
27COMPATIBLE_MACHINE = "(imx-generic-bsp)" 27COMPATIBLE_MACHINE = "(imx-generic-bsp)"