Merge pull request #1865 from Freescale/backport-1864-to-scarthgap

[Backport scarthgap] linux-fslc: 6.6.32 -> 6.6.36, u-boot-fslc: 2024.04 -> 2024.07
author: Otavio Salvador <otavio@ossystems.com.br> 2024-07-09 17:33:29 -0300
committer: GitHub <noreply@github.com> 2024-07-09 17:33:29 -0300
commit: 3d5b0042ff2efad14b456ec7fbaaf7fd7f7ed781 (patch)
tree: 61a100900a7db46d310607756ce35cfb09dc15ab
parent: 1444416aeb875d5b62008aaf31a5cb6b596cc41a (diff)
parent: f3e56d17190ba0e8fa9b9b6f0adfea47494626a1 (diff)
download: meta-freescale-3d5b0042ff2efad14b456ec7fbaaf7fd7f7ed781.tar.gz
4 files changed, 6 insertions, 6 deletions
diff --git a/recipes-bsp/u-boot/u-boot-fslc-common_2024.04.inc b/recipes-bsp/u-boot/u-boot-fslc-common_2024.07.inc
index b270dfd7..214d4532 100644
--- a/recipes-bsp/u-boot/u-boot-fslc-common_2024.04.inc
+++ b/recipes-bsp/u-boot/u-boot-fslc-common_2024.07.inc
@@ -10,10 +10,10 @@ DEPENDS += "flex-native bison-native"
 SRC_URI = "git://github.com/Freescale/u-boot-fslc.git;branch=${SRCBRANCH};protocol=https"
-SRCREV = "1a2bdc16b79a6f9c31829ede1bbf4063ccea6e54"
+SRCREV = "1406c04f60f5c375e0fc77b9f661aecd08dff45e"
-SRCBRANCH = "2024.04+fslc"
+SRCBRANCH = "2024.07+fslc"
-PV = "2024.04+git${SRCPV}"
+PV = "2024.07+fslc+git${SRCPV}"
 S = "${WORKDIR}/git"
 B = "${WORKDIR}/build"
diff --git a/recipes-bsp/u-boot/u-boot-fslc-mxsboot_2024.04.bb b/recipes-bsp/u-boot/u-boot-fslc-mxsboot_2024.07.bb
index b7e4ca76..b7e4ca76 100644
--- a/recipes-bsp/u-boot/u-boot-fslc-mxsboot_2024.04.bb
+++ b/recipes-bsp/u-boot/u-boot-fslc-mxsboot_2024.07.bb
diff --git a/recipes-bsp/u-boot/u-boot-fslc_2024.04.bb b/recipes-bsp/u-boot/u-boot-fslc_2024.07.bb
index eba8876a..eba8876a 100644
--- a/recipes-bsp/u-boot/u-boot-fslc_2024.04.bb
+++ b/recipes-bsp/u-boot/u-boot-fslc_2024.07.bb
diff --git a/recipes-kernel/linux/linux-fslc_6.6.bb b/recipes-kernel/linux/linux-fslc_6.6.bb
index f9a54080..35489fef 100644
--- a/recipes-kernel/linux/linux-fslc_6.6.bb
+++ b/recipes-kernel/linux/linux-fslc_6.6.bb
@@ -1,4 +1,4 @@
-# Copyright (C) 2012-2019 O.S. Systems Software LTDA.
+# Copyright (C) 2012-2024 O.S. Systems Software LTDA.
 # Released under the MIT license (see COPYING.MIT for the terms)
 #
 # SPDX-License-Identifier: MIT
@@ -19,10 +19,10 @@ SRC_URI = "git://github.com/Freescale/linux-fslc.git;branch=${KBRANCH};protocol=
 #
 # LINUX_VERSION define should match to the kernel version referenced by SRC_URI and
 # should be updated once patchlevel is merged.
-LINUX_VERSION = "6.6.32"
+LINUX_VERSION = "6.6.36"
 KBRANCH = "6.6.x+fslc"
-SRCREV = "8c0a83d1bb158cd9d90ab7378fd963e72b4a5a7f"
+SRCREV = "32a79dc5c8f69f1eb7b10b7707b0078fb2fdfa98"
 KBUILD_DEFCONFIG:mx5-generic-bsp = "imx_v6_v7_defconfig"
 KBUILD_DEFCONFIG:mx6-generic-bsp = "imx_v6_v7_defconfig"
author	Otavio Salvador <otavio@ossystems.com.br>	2024-07-09 17:33:29 -0300
committer	GitHub <noreply@github.com>	2024-07-09 17:33:29 -0300
commit	3d5b0042ff2efad14b456ec7fbaaf7fd7f7ed781 (patch)
tree	61a100900a7db46d310607756ce35cfb09dc15ab
parent	1444416aeb875d5b62008aaf31a5cb6b596cc41a (diff)
parent	f3e56d17190ba0e8fa9b9b6f0adfea47494626a1 (diff)
download	meta-freescale-3d5b0042ff2efad14b456ec7fbaaf7fd7f7ed781.tar.gz

diff --git a/recipes-bsp/u-boot/u-boot-fslc-common_2024.04.inc b/recipes-bsp/u-boot/u-boot-fslc-common_2024.07.inc index b270dfd7..214d4532 100644 --- a/recipes-bsp/u-boot/u-boot-fslc-common_2024.04.inc +++ b/recipes-bsp/u-boot/u-boot-fslc-common_2024.07.inc
@@ -10,10 +10,10 @@ DEPENDS += "flex-native bison-native"
10		10
11	SRC_URI = "git://github.com/Freescale/u-boot-fslc.git;branch=${SRCBRANCH};protocol=https"	11	SRC_URI = "git://github.com/Freescale/u-boot-fslc.git;branch=${SRCBRANCH};protocol=https"
12		12
13	SRCREV = "1a2bdc16b79a6f9c31829ede1bbf4063ccea6e54"	13	SRCREV = "1406c04f60f5c375e0fc77b9f661aecd08dff45e"
14	SRCBRANCH = "2024.04+fslc"	14	SRCBRANCH = "2024.07+fslc"
15		15
16	PV = "2024.04+git${SRCPV}"	16	PV = "2024.07+fslc+git${SRCPV}"
17		17
18	S = "${WORKDIR}/git"	18	S = "${WORKDIR}/git"
19	B = "${WORKDIR}/build"	19	B = "${WORKDIR}/build"


diff --git a/recipes-bsp/u-boot/u-boot-fslc-mxsboot_2024.04.bb b/recipes-bsp/u-boot/u-boot-fslc-mxsboot_2024.07.bb index b7e4ca76..b7e4ca76 100644 --- a/recipes-bsp/u-boot/u-boot-fslc-mxsboot_2024.04.bb +++ b/recipes-bsp/u-boot/u-boot-fslc-mxsboot_2024.07.bb


diff --git a/recipes-bsp/u-boot/u-boot-fslc_2024.04.bb b/recipes-bsp/u-boot/u-boot-fslc_2024.07.bb index eba8876a..eba8876a 100644 --- a/recipes-bsp/u-boot/u-boot-fslc_2024.04.bb +++ b/recipes-bsp/u-boot/u-boot-fslc_2024.07.bb


diff --git a/recipes-kernel/linux/linux-fslc_6.6.bb b/recipes-kernel/linux/linux-fslc_6.6.bb index f9a54080..35489fef 100644 --- a/recipes-kernel/linux/linux-fslc_6.6.bb +++ b/recipes-kernel/linux/linux-fslc_6.6.bb
@@ -1,4 +1,4 @@
1	# Copyright (C) 2012-2019 O.S. Systems Software LTDA.	1	# Copyright (C) 2012-2024 O.S. Systems Software LTDA.
2	# Released under the MIT license (see COPYING.MIT for the terms)	2	# Released under the MIT license (see COPYING.MIT for the terms)
3	#	3	#
4	# SPDX-License-Identifier: MIT	4	# SPDX-License-Identifier: MIT
@@ -19,10 +19,10 @@ SRC_URI = "git://github.com/Freescale/linux-fslc.git;branch=${KBRANCH};protocol=
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.
22	LINUX_VERSION = "6.6.32"	22	LINUX_VERSION = "6.6.36"
23		23
24	KBRANCH = "6.6.x+fslc"	24	KBRANCH = "6.6.x+fslc"
25	SRCREV = "8c0a83d1bb158cd9d90ab7378fd963e72b4a5a7f"	25	SRCREV = "32a79dc5c8f69f1eb7b10b7707b0078fb2fdfa98"
26		26
27	KBUILD_DEFCONFIG:mx5-generic-bsp = "imx_v6_v7_defconfig"	27	KBUILD_DEFCONFIG:mx5-generic-bsp = "imx_v6_v7_defconfig"
28	KBUILD_DEFCONFIG:mx6-generic-bsp = "imx_v6_v7_defconfig"	28	KBUILD_DEFCONFIG:mx6-generic-bsp = "imx_v6_v7_defconfig"