From fe602e0c9a73156b219d3c6f6edf28a44c7a0468 Mon Sep 17 00:00:00 2001 From: Andrey Zhizhikin Date: Sat, 12 Nov 2022 21:59:13 +0100 Subject: linux-fslc: upgrade to 6.0.x+fslc Pick up the latest kernel branch from linux-fslc repository. Kernel repository has been upgraded up to v6.0.8 from stable korg. Following commits are added on top of stable tree: ---- 33feefb4abb5 ("ARM64: defconfig: Enable KPROBES so allow LTTng use") 00ce47c59e05 ("ARM: mxs_defconfig: Enable KPROBES so allow LTTng use") a48efba70ee4 ("ARM: imx_v6_v7_defconfig: Remove evbug as it is not normally used") 6fbff42d0be3 ("media: coda: Change firmware probing order") eb1cc8f3f553 ("drivers, misc: add U-Boot bootcount driver") 67e3d36f1000 ("fec: Add disable_giga parameter to force 10/100 operation") e1a8d8edfc66 ("MA-7633-2 [Android-Reboot]reboot to fastboot\recovery mode") 075a509508b6 ("ARM: imx: add cpu_is_imx6() routine") ---- Signed-off-by: Andrey Zhizhikin --- recipes-kernel/linux/linux-fslc-mfgtool_5.18.bb | 15 -------------- recipes-kernel/linux/linux-fslc-mfgtool_6.0.bb | 15 ++++++++++++++ recipes-kernel/linux/linux-fslc_5.18.bb | 27 ------------------------- recipes-kernel/linux/linux-fslc_6.0.bb | 27 +++++++++++++++++++++++++ 4 files changed, 42 insertions(+), 42 deletions(-) delete mode 100644 recipes-kernel/linux/linux-fslc-mfgtool_5.18.bb create mode 100644 recipes-kernel/linux/linux-fslc-mfgtool_6.0.bb delete mode 100644 recipes-kernel/linux/linux-fslc_5.18.bb create mode 100644 recipes-kernel/linux/linux-fslc_6.0.bb diff --git a/recipes-kernel/linux/linux-fslc-mfgtool_5.18.bb b/recipes-kernel/linux/linux-fslc-mfgtool_5.18.bb deleted file mode 100644 index 09d35c91..00000000 --- a/recipes-kernel/linux/linux-fslc-mfgtool_5.18.bb +++ /dev/null @@ -1,15 +0,0 @@ -# Copyright (C) 2014-2018 O.S. Systems Software LTDA. -# Copyright (C) 2014-2016 Freescale Semiconductor - -SUMMARY = "Produces a Manufacturing Tool compatible Linux Kernel" -DESCRIPTION = "Linux Kernel provided and supported by the Freescale Community \ -that produces a Manufacturing Tool compatible Linux Kernel to be used in updater \ -environment" - -FILESEXTRAPATHS:prepend := "${THISDIR}/linux-fslc:" -require linux-fslc_${PV}.bb -require linux-mfgtool.inc - -KERNEL_IMAGE_BASE_NAME[vardepsexclude] = "DATETIME" -MODULE_IMAGE_BASE_NAME[vardepsexclude] = "DATETIME" -do_package[vardepsexclude] = "DATETIME" diff --git a/recipes-kernel/linux/linux-fslc-mfgtool_6.0.bb b/recipes-kernel/linux/linux-fslc-mfgtool_6.0.bb new file mode 100644 index 00000000..09d35c91 --- /dev/null +++ b/recipes-kernel/linux/linux-fslc-mfgtool_6.0.bb @@ -0,0 +1,15 @@ +# Copyright (C) 2014-2018 O.S. Systems Software LTDA. +# Copyright (C) 2014-2016 Freescale Semiconductor + +SUMMARY = "Produces a Manufacturing Tool compatible Linux Kernel" +DESCRIPTION = "Linux Kernel provided and supported by the Freescale Community \ +that produces a Manufacturing Tool compatible Linux Kernel to be used in updater \ +environment" + +FILESEXTRAPATHS:prepend := "${THISDIR}/linux-fslc:" +require linux-fslc_${PV}.bb +require linux-mfgtool.inc + +KERNEL_IMAGE_BASE_NAME[vardepsexclude] = "DATETIME" +MODULE_IMAGE_BASE_NAME[vardepsexclude] = "DATETIME" +do_package[vardepsexclude] = "DATETIME" diff --git a/recipes-kernel/linux/linux-fslc_5.18.bb b/recipes-kernel/linux/linux-fslc_5.18.bb deleted file mode 100644 index 363a2989..00000000 --- a/recipes-kernel/linux/linux-fslc_5.18.bb +++ /dev/null @@ -1,27 +0,0 @@ -# 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 mainline based kernel with backported features and fixes" -DESCRIPTION = "Linux kernel based on mainline kernel used by FSL Community BSP in order to \ -provide support for some backported features and fixes, or because it was applied in linux-next \ -and takes some time to become part of a stable version, or because it is not applicable for \ -upstreaming." - -include linux-fslc.inc - -LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46" - -# 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 = "5.18.5" - -KBRANCH = "5.18.x+fslc" -SRCREV = "1d6b3055ae6a2ab50a911a6482dbd750c09cd3e0" - -COMPATIBLE_MACHINE = "(imx-generic-bsp)" diff --git a/recipes-kernel/linux/linux-fslc_6.0.bb b/recipes-kernel/linux/linux-fslc_6.0.bb new file mode 100644 index 00000000..b0af4ecf --- /dev/null +++ b/recipes-kernel/linux/linux-fslc_6.0.bb @@ -0,0 +1,27 @@ +# 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 mainline based kernel with backported features and fixes" +DESCRIPTION = "Linux kernel based on mainline kernel used by FSL Community BSP in order to \ +provide support for some backported features and fixes, or because it was applied in linux-next \ +and takes some time to become part of a stable version, or because it is not applicable for \ +upstreaming." + +include linux-fslc.inc + +LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46" + +# 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.0.8" + +KBRANCH = "6.0.x+fslc" +SRCREV = "86f408e846e088a25a225b5a962ed16515ac4e54" + +COMPATIBLE_MACHINE = "(imx-generic-bsp)" -- cgit v1.2.3-54-g00ecf