From bbe8b6e6ecca38da807d6e1922a62b3bcbb42ace Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Benjamin=20Sz=C5=91ke?= Date: Fri, 27 Sep 2024 19:24:34 +0200 Subject: [PATCH 1/3] linux-fslc: 6.6.50 -> 6.11.0 (cherry picked from commit d710286700d25ffb0a2ba94c3ee3943b352b7bd6) --- .../linux/{linux-fslc_6.6.bb => linux-fslc_6.11.bb} | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) rename recipes-kernel/linux/{linux-fslc_6.6.bb => linux-fslc_6.11.bb} (90%) diff --git a/recipes-kernel/linux/linux-fslc_6.6.bb b/recipes-kernel/linux/linux-fslc_6.11.bb similarity index 90% rename from recipes-kernel/linux/linux-fslc_6.6.bb rename to recipes-kernel/linux/linux-fslc_6.11.bb index 1919eacdf2..cf4c117b50 100644 --- a/recipes-kernel/linux/linux-fslc_6.6.bb +++ b/recipes-kernel/linux/linux-fslc_6.11.bb @@ -14,15 +14,19 @@ require linux-imx.inc SRC_URI = "git://github.com/Freescale/linux-fslc.git;branch=${KBRANCH};protocol=https" +DEPENDS += " \ + coreutils-native \ +" + # 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.6.50" +LINUX_VERSION = "6.11.0" -KBRANCH = "6.6.x+fslc" -SRCREV = "2473dfed9007471b503efe1f7de74d63eaf4c699" +KBRANCH = "6.11.x+fslc" +SRCREV = "98f7e32f20d28ec452afb208f9cffc08448a2652" KBUILD_DEFCONFIG:mx5-generic-bsp = "imx_v6_v7_defconfig" KBUILD_DEFCONFIG:mx6-generic-bsp = "imx_v6_v7_defconfig" From 0476968d4dd9365edfe1855bd98083bf0f61d374 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Benjamin=20Sz=C5=91ke?= Date: Fri, 27 Sep 2024 22:38:01 +0200 Subject: [PATCH 2/3] linux-fslc-lts: update to v6.6.50 (cherry picked from commit 64ec836a179d1cd95196a3315cd8550b78c25e9e) --- .../{linux-fslc-lts_6.1.bb => linux-fslc-lts_6.6.bb} | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) rename recipes-kernel/linux/{linux-fslc-lts_6.1.bb => linux-fslc-lts_6.6.bb} (80%) diff --git a/recipes-kernel/linux/linux-fslc-lts_6.1.bb b/recipes-kernel/linux/linux-fslc-lts_6.6.bb similarity index 80% rename from recipes-kernel/linux/linux-fslc-lts_6.1.bb rename to recipes-kernel/linux/linux-fslc-lts_6.6.bb index 8e1bab4bec..a8c91cdb8a 100644 --- a/recipes-kernel/linux/linux-fslc-lts_6.1.bb +++ b/recipes-kernel/linux/linux-fslc-lts_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 @@ -12,8 +12,6 @@ upstreaming in any form." require linux-imx.inc -KERNEL_DEVICETREE_32BIT_COMPATIBILITY_UPDATE = "1" - 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 @@ -21,13 +19,11 @@ 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.72" +LINUX_VERSION = "6.6.50" -KBRANCH = "6.1.x+fslc" -SRCREV = "b80c9dede70132da3ae7feb949fe0803aad3db24" +KBRANCH = "6.6.x+fslc" +SRCREV = "2473dfed9007471b503efe1f7de74d63eaf4c699" -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" From d180f563e2e25b53d93729820db4d1699015b22c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Benjamin=20Sz=C5=91ke?= Date: Sat, 28 Sep 2024 15:43:08 +0200 Subject: [PATCH 3/3] linux-fslc-lts: restore LTS v6.1 (cherry picked from commit 39d58dfc62163d8909b774d29ed8fbb17d25ccd4) --- recipes-kernel/linux/linux-fslc-lts_6.1.bb | 41 ++++++++++++++++++++++ 1 file changed, 41 insertions(+) create mode 100644 recipes-kernel/linux/linux-fslc-lts_6.1.bb diff --git a/recipes-kernel/linux/linux-fslc-lts_6.1.bb b/recipes-kernel/linux/linux-fslc-lts_6.1.bb new file mode 100644 index 0000000000..8e1bab4bec --- /dev/null +++ b/recipes-kernel/linux/linux-fslc-lts_6.1.bb @@ -0,0 +1,41 @@ +# 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 + +KERNEL_DEVICETREE_32BIT_COMPATIBILITY_UPDATE = "1" + +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.72" + +KBRANCH = "6.1.x+fslc" +SRCREV = "b80c9dede70132da3ae7feb949fe0803aad3db24" + +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)"