From 14c284eb5361bd5e7526061ec03a109e2698d08a Mon Sep 17 00:00:00 2001 From: Luan Rafael Carneiro Date: Fri, 12 Apr 2024 16:09:44 -0300 Subject: linux-fslc-imx: Update from v6.1 to v6.6 Update linux-fslc-imx from version 6.1 to 6.6. This commit also changes 32-bit imx based machines to add device tree subdirectory. The changed machines are: - conf/machine/imx6qdlsabreauto.conf - conf/machine/imx6qdlsabresd.conf - conf/machine/imx6slevk.conf - conf/machine/imx6sllevk.conf - conf/machine/imx6sxsabreauto.conf - conf/machine/imx6sxsabresd.conf - conf/machine/imx6ulevk.conf - conf/machine/imx6ullevk.conf - conf/machine/imx6ulz-14x14-evk.conf - conf/machine/imx7dsabresd.conf - conf/machine/imx7ulpevk.conf Signed-off-by: Luan Rafael Carneiro --- recipes-kernel/linux/linux-fslc-imx_6.1.bb | 80 ------------------------------ recipes-kernel/linux/linux-fslc-imx_6.6.bb | 78 +++++++++++++++++++++++++++++ 2 files changed, 78 insertions(+), 80 deletions(-) delete mode 100644 recipes-kernel/linux/linux-fslc-imx_6.1.bb create mode 100644 recipes-kernel/linux/linux-fslc-imx_6.6.bb (limited to 'recipes-kernel') diff --git a/recipes-kernel/linux/linux-fslc-imx_6.1.bb b/recipes-kernel/linux/linux-fslc-imx_6.1.bb deleted file mode 100644 index 1d6fdf34..00000000 --- a/recipes-kernel/linux/linux-fslc-imx_6.1.bb +++ /dev/null @@ -1,80 +0,0 @@ -# Released under the MIT license (see COPYING.MIT for the terms) -# -# SPDX-License-Identifier: MIT -# - -SUMMARY = "Linux Kernel provided by NXP and supported by Community" -DESCRIPTION = "Linux Kernel provided by NXP as the part of release distribution. \ -Main focus is set on i.MX Family Reference Boards. \ -It includes support for many NXP Proprietary IPs (GPU, VPU, IPU). \ -Latest stable Kernel patchlevel is applied and maintained by Community." - -############################################################################### -# This recipe (and corresponding kernel repository and branch) receives updates -# from 3 different sources: -# 1. Stable [linux-6.1.y] branch updates of korg; -# 2. NXP-specific updates via branch [lf-6.1.y] shared via GitHub NXP repo; -# 3. Critical patches, which are not (yet) integrated into either of 2 above -# sources, but are required to be applied to the kernel tree. -# -# Therefore, there is a need to keep track on the patches which are introduced -# from every source. This could be achieved in this recipe by filling the -# below list with the information once the update is performed from any source. -# -# Once the critical patch gets merged into the stable branch, or NXP-specific -# patches would be covered by the tag - individual entries from sections below -# could be removed. -# -# ------------------------------------------------------------------------------ -# 1. Stable (tag or SHA(s)) -# ------------------------------------------------------------------------------ -# tag: v6.1.70 -# -# ------------------------------------------------------------------------------ -# 2. NXP-specific (tag or SHA(s)) -# ------------------------------------------------------------------------------ -# tag: lf-6.1.55-2.2.0 -# -# ------------------------------------------------------------------------------ -# 3. Critical patches (SHA(s)) -# ------------------------------------------------------------------------------ -# - 77a660738af5 Revert "net: stmmac: fix FPE events losing" -# - d9e9cb8ce9bc hx280enc_vc8000e: fix misplaced #endif -# - 3f1f2ea72955 mxc: gpu-viv: change _QuerySignal() return type to gceSTATUS -# - b73c6797ee42 ARM: imx_v7_defconfig: Remove KERNEL_LZO config -# - ec33c7fc43be touchscreen: Kconfig: add I2C dependency for CT36X -# - 6c41233a2cfb pwm: pwm-adp5585: fix get_state callback prototype -# - 9c7540ecb891 pwm: pwm-rpmsg-imx: fix get_state callback prototype -# -# NOTE to upgraders: -# This recipe should NOT collect individual patches, they should be applied to -# the linux-fslc kernel tree on the corresponding branch, and tracking -# information should be properly filled in above. -############################################################################### - -require linux-imx.inc - -KERNEL_DEVICETREE_32BIT_COMPATIBILITY_UPDATE = "1" - -KBRANCH = "6.1-2.2.x-imx" -SRC_URI = "git://github.com/Freescale/linux-fslc.git;branch=${KBRANCH};protocol=https" -SRCREV = "2bfda7392e6621dd9060f87d7f9d601bb1906dbf" - -# 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.70" - -KBUILD_DEFCONFIG:mx6-generic-bsp = "imx_v7_defconfig" -KBUILD_DEFCONFIG:mx7-generic-bsp = "imx_v7_defconfig" -KBUILD_DEFCONFIG:mx8-generic-bsp = "imx_v8_defconfig" -KBUILD_DEFCONFIG:mx9-generic-bsp = "imx_v8_defconfig" - -# Local version indicates the branch name in the NXP kernel tree where patches are collected from. -LOCALVERSION = "-lf-6.1.y" - -DEFAULT_PREFERENCE = "1" - -COMPATIBLE_MACHINE = "(imx-nxp-bsp)" diff --git a/recipes-kernel/linux/linux-fslc-imx_6.6.bb b/recipes-kernel/linux/linux-fslc-imx_6.6.bb new file mode 100644 index 00000000..6e31c1e2 --- /dev/null +++ b/recipes-kernel/linux/linux-fslc-imx_6.6.bb @@ -0,0 +1,78 @@ +# Released under the MIT license (see COPYING.MIT for the terms) +# +# SPDX-License-Identifier: MIT +# + +SUMMARY = "Linux Kernel provided by NXP and supported by Community" +DESCRIPTION = "Linux Kernel provided by NXP as the part of release distribution. \ +Main focus is set on i.MX Family Reference Boards. \ +It includes support for many NXP Proprietary IPs (GPU, VPU, IPU). \ +Latest stable Kernel patchlevel is applied and maintained by Community." + +############################################################################### +# This recipe (and corresponding kernel repository and branch) receives updates +# from 3 different sources: +# 1. Stable [linux-6.1.y] branch updates of korg; +# 2. NXP-specific updates via branch [lf-6.1.y] shared via GitHub NXP repo; +# 3. Critical patches, which are not (yet) integrated into either of 2 above +# sources, but are required to be applied to the kernel tree. +# +# Therefore, there is a need to keep track on the patches which are introduced +# from every source. This could be achieved in this recipe by filling the +# below list with the information once the update is performed from any source. +# +# Once the critical patch gets merged into the stable branch, or NXP-specific +# patches would be covered by the tag - individual entries from sections below +# could be removed. +# +# ------------------------------------------------------------------------------ +# 1. Stable (tag or SHA(s)) +# ------------------------------------------------------------------------------ +# tag: v6.1.70 +# +# ------------------------------------------------------------------------------ +# 2. NXP-specific (tag or SHA(s)) +# ------------------------------------------------------------------------------ +# tag: lf-6.1.55-2.2.0 +# +# ------------------------------------------------------------------------------ +# 3. Critical patches (SHA(s)) +# ------------------------------------------------------------------------------ +# - 77a660738af5 Revert "net: stmmac: fix FPE events losing" +# - d9e9cb8ce9bc hx280enc_vc8000e: fix misplaced #endif +# - 3f1f2ea72955 mxc: gpu-viv: change _QuerySignal() return type to gceSTATUS +# - b73c6797ee42 ARM: imx_v7_defconfig: Remove KERNEL_LZO config +# - ec33c7fc43be touchscreen: Kconfig: add I2C dependency for CT36X +# - 6c41233a2cfb pwm: pwm-adp5585: fix get_state callback prototype +# - 9c7540ecb891 pwm: pwm-rpmsg-imx: fix get_state callback prototype +# +# NOTE to upgraders: +# This recipe should NOT collect individual patches, they should be applied to +# the linux-fslc kernel tree on the corresponding branch, and tracking +# information should be properly filled in above. +############################################################################### + +require linux-imx.inc + +KBRANCH = "6.6-1.0.x-imx" +SRC_URI = "git://github.com/Freescale/linux-fslc.git;branch=${KBRANCH};protocol=https" +SRCREV = "ccf0a99701a701fb48a04e31ffe3f9d585a8374a" + +# 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.3" + +KBUILD_DEFCONFIG:mx6-generic-bsp = "imx_v7_defconfig" +KBUILD_DEFCONFIG:mx7-generic-bsp = "imx_v7_defconfig" +KBUILD_DEFCONFIG:mx8-generic-bsp = "imx_v8_defconfig" +KBUILD_DEFCONFIG:mx9-generic-bsp = "imx_v8_defconfig" + +# Local version indicates the branch name in the NXP kernel tree where patches are collected from. +LOCALVERSION = "-lf-6.6.y" + +DEFAULT_PREFERENCE = "1" + +COMPATIBLE_MACHINE = "(imx-nxp-bsp)" -- cgit v1.2.3-54-g00ecf