From e93da36c319d4b1e7de925548ceb3b8788697ba0 Mon Sep 17 00:00:00 2001 From: Otavio Salvador Date: Tue, 9 Jul 2024 14:32:34 -0300 Subject: [PATCH 1/2] u-boot-fslc: 2024.04 -> 2024.07 Signed-off-by: Otavio Salvador (cherry picked from commit 6f680b1c5b931348e07868a0a486b921f022aef4) --- ...lc-common_2024.04.inc => u-boot-fslc-common_2024.07.inc} | 6 +++--- ...lc-mxsboot_2024.04.bb => u-boot-fslc-mxsboot_2024.07.bb} | 0 .../{u-boot-fslc_2024.04.bb => u-boot-fslc_2024.07.bb} | 0 3 files changed, 3 insertions(+), 3 deletions(-) rename recipes-bsp/u-boot/{u-boot-fslc-common_2024.04.inc => u-boot-fslc-common_2024.07.inc} (79%) rename recipes-bsp/u-boot/{u-boot-fslc-mxsboot_2024.04.bb => u-boot-fslc-mxsboot_2024.07.bb} (100%) rename recipes-bsp/u-boot/{u-boot-fslc_2024.04.bb => u-boot-fslc_2024.07.bb} (100%) 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 similarity index 79% rename from recipes-bsp/u-boot/u-boot-fslc-common_2024.04.inc rename to recipes-bsp/u-boot/u-boot-fslc-common_2024.07.inc index b270dfd74..214d45323 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" -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/recipes-bsp/u-boot/u-boot-fslc-mxsboot_2024.04.bb b/recipes-bsp/u-boot/u-boot-fslc-mxsboot_2024.07.bb similarity index 100% rename from recipes-bsp/u-boot/u-boot-fslc-mxsboot_2024.04.bb rename to 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 similarity index 100% rename from recipes-bsp/u-boot/u-boot-fslc_2024.04.bb rename to recipes-bsp/u-boot/u-boot-fslc_2024.07.bb From f3e56d17190ba0e8fa9b9b6f0adfea47494626a1 Mon Sep 17 00:00:00 2001 From: Otavio Salvador Date: Tue, 9 Jul 2024 14:46:02 -0300 Subject: [PATCH 2/2] linux-fslc: 6.6.32 -> 6.6.36 Signed-off-by: Otavio Salvador (cherry picked from commit c1bd142771904927c30a2b236f89b44e25ea6623) --- recipes-kernel/linux/linux-fslc_6.6.bb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/recipes-kernel/linux/linux-fslc_6.6.bb b/recipes-kernel/linux/linux-fslc_6.6.bb index f9a54080e..35489fefb 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"