Merge pull request #1677 from zandrey/feat/upgrade-fslc-mainline-core…

…-packages Upgrade Kernel to 6.6.y + LTS Kernel 6.1.y + U-Boot 2023.10
Freescale · Oct 30, 2023 · 37bd435 · 37bd435
2 parents 56ae548 + 6552100
commit 37bd435
Show file tree

Hide file tree

Showing 5 changed files with 45 additions and 6 deletions.
diff --git a/...bsp/u-boot/u-boot-fslc-common_2023.04.inc → ...bsp/u-boot/u-boot-fslc-common_2023.10.inc b/...bsp/u-boot/u-boot-fslc-common_2023.04.inc → ...bsp/u-boot/u-boot-fslc-common_2023.10.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 = "7341fbb267e0cdb031c6ba6aa6572fe4be75d3c6"
-SRCBRANCH = "2023.04+fslc"
+SRCREV = "105a9c8cc0a8551195e2a5ac8812802f12604ff6"
+SRCBRANCH = "2023.10+fslc"
 
-PV = "2023.04+git${SRCPV}"
+PV = "2023.10+git${SRCPV}"
 
 S = "${WORKDIR}/git"
 B = "${WORKDIR}/build"
diff --git a/...bsp/u-boot/u-boot-fslc-mxsboot_2023.04.bb → ...bsp/u-boot/u-boot-fslc-mxsboot_2023.10.bb b/...bsp/u-boot/u-boot-fslc-mxsboot_2023.04.bb → ...bsp/u-boot/u-boot-fslc-mxsboot_2023.10.bb
diff --git a/recipes-bsp/u-boot/u-boot-fslc_2023.04.bb → recipes-bsp/u-boot/u-boot-fslc_2023.10.bb b/recipes-bsp/u-boot/u-boot-fslc_2023.04.bb → recipes-bsp/u-boot/u-boot-fslc_2023.10.bb
diff --git a/recipes-kernel/linux/linux-fslc-lts_6.1.bb b/recipes-kernel/linux/linux-fslc-lts_6.1.bb
@@ -0,0 +1,39 @@
+# Copyright (C) 2012-2019 O.S. Systems Software LTDA.
+# Released under the MIT license (see COPYING.MIT for the terms)
+#
+# SPDX-License-Identifier: MIT
+#
+
+SUMMARY = "FSL Community BSP Linux LTS based kernel with backported features and fixes"
+DESCRIPTION = "Linux kernel based on LTS kernel used by FSL Community BSP in order to \
+provide support for some backported features and fixes, or because it was applied in upstream \
+and will not become part of a LTS version, or because it is not applicable for \
+upstreaming in any form."
+
+require linux-imx.inc
+
+SRC_URI = "git://github.com/Freescale/linux-fslc.git;branch=${KBRANCH};protocol=https"
+
+# PV is defined in the base in linux-imx.inc file and uses the LINUX_VERSION definition
+# required by kernel-yocto.bbclass.
+#
+# LINUX_VERSION define should match to the kernel version referenced by SRC_URI and
+# should be updated once patchlevel is merged.
+LINUX_VERSION = "6.1.60"
+
+KBRANCH = "6.1.x+fslc"
+SRCREV = "62808a9f302b57493a3c8251a7e83e1dbfb75c88"
+
+KBUILD_DEFCONFIG:mx5-generic-bsp = "imx_v6_v7_defconfig"
+KBUILD_DEFCONFIG:mx5-generic-bsp = "imx_v6_v7_defconfig"
+KBUILD_DEFCONFIG:mx5-generic-bsp = "imx_v6_v7_defconfig"
+KBUILD_DEFCONFIG:mx6-generic-bsp = "imx_v6_v7_defconfig"
+KBUILD_DEFCONFIG:mx7-generic-bsp = "imx_v6_v7_defconfig"
+KBUILD_DEFCONFIG:mx8-generic-bsp = "defconfig"
+KBUILD_DEFCONFIG:mx9-generic-bsp = "defconfig"
+KBUILD_DEFCONFIG:mxs-generic-bsp = "mxs_defconfig"
+KBUILD_DEFCONFIG:vf-generic-bsp = "imx_v6_v7_defconfig"
+
+LOCALVERSION = "-fslc"
+
+COMPATIBLE_MACHINE = "(imx-generic-bsp)"
diff --git a/recipes-kernel/linux/linux-fslc_6.1.bb → recipes-kernel/linux/linux-fslc_6.6.bb b/recipes-kernel/linux/linux-fslc_6.1.bb → recipes-kernel/linux/linux-fslc_6.6.bb
@@ -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.1.57"
+LINUX_VERSION = "6.6"
 
-KBRANCH = "6.1.x+fslc"
-SRCREV = "2c0a3c104b3104e0244b32ac25151f699ac960c3"
+KBRANCH = "6.6.x+fslc"
+SRCREV = "34836895e19e910f736b06d7dbe522f4a33857f8"
 
 KBUILD_DEFCONFIG:mx5-generic-bsp = "imx_v6_v7_defconfig"
 KBUILD_DEFCONFIG:mx5-generic-bsp = "imx_v6_v7_defconfig"