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
Freescale · Jul 9, 2024 · 3d5b004 · 3d5b004
2 parents 1444416 + f3e56d1
commit 3d5b004
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 6 deletions.
diff --git a/...bsp/u-boot/u-boot-fslc-common_2024.04.inc → ...bsp/u-boot/u-boot-fslc-common_2024.07.inc b/...bsp/u-boot/u-boot-fslc-common_2024.04.inc → ...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"
-SRCBRANCH = "2024.04+fslc"
+SRCREV = "1406c04f60f5c375e0fc77b9f661aecd08dff45e"
+SRCBRANCH = "2024.07+fslc"
 
-PV = "2024.04+git${SRCPV}"
+PV = "2024.07+fslc+git${SRCPV}"
 
 S = "${WORKDIR}/git"
 B = "${WORKDIR}/build"
diff --git a/...bsp/u-boot/u-boot-fslc-mxsboot_2024.04.bb → ...bsp/u-boot/u-boot-fslc-mxsboot_2024.07.bb b/...bsp/u-boot/u-boot-fslc-mxsboot_2024.04.bb → ...bsp/u-boot/u-boot-fslc-mxsboot_2024.07.bb
diff --git a/recipes-bsp/u-boot/u-boot-fslc_2024.04.bb → recipes-bsp/u-boot/u-boot-fslc_2024.07.bb b/recipes-bsp/u-boot/u-boot-fslc_2024.04.bb → 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
@@ -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"